You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sv...@apache.org on 2007/06/25 08:26:47 UTC
svn commit: r550378 - in
/incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy:
./ impl/ service/ xml/
Author: svkrish
Date: Sun Jun 24 23:26:45 2007
New Revision: 550378
URL: http://svn.apache.org/viewvc?view=rev&rev=550378
Log:
undoing halfbaked commits and merging back with r550353
Removed:
incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/BindingType.java
incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ExtensionType.java
incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ImplementationType.java
incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentMapQualifier.java
incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/SCADefinitions.java
incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java
incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ExtensionTypeImpl.java
incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java
incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapQualifierImpl.java
incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/SCADefinitionsImpl.java
incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/service/
incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/xml/
Modified:
incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java
incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java
incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java
incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java
incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java
incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java
Modified: incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java?view=diff&rev=550378&r1=550377&r2=550378
==============================================================================
--- incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java (original)
+++ incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java Sun Jun 24 23:26:45 2007
@@ -39,26 +39,27 @@
* @param providedIntent the intent realized by this intent map
*/
void setProvidedIntent(Intent providedIntent);
-
+
/**
- * Returns the list of qualifiers for this Intent Map
+ * Returns the default qualified intent map.
*
- * @return
+ * @return the default qualified intent map
*/
- List<IntentMapQualifier> getQualifiers();
-
+ IntentMap getDefaultQualifiedIntentMap();
+
/**
- * Returns the default qualifier for this Intent Map
- * @return
+ * Sets the default qualified intent map.
+ *
+ * @param defaultQualifiedIntentMap the default qualified intent map
*/
- IntentMapQualifier getDefaultQualifier();
-
+ void setDefaultQualifiedIntentMap(IntentMap defaultQualifiedIntentMap);
+
/**
- * sets the default qualifier for this Intent Map
+ * Returns the list of children qualified intent maps.
*
- * @param qualifier
+ * @return
*/
- void setDefaultQualifier(IntentMapQualifier qualifier);
+ List<IntentMap> getQualifiedIntentMaps();
/**
* Returns the list of concrete policies, either WS-Policy policy
@@ -82,19 +83,5 @@
* @param unresolved whether the model element is unresolved
*/
void setUnresolved(boolean unresolved);
-
- /**
- * Returns the default qualified intent map.
- *
- * @return the default qualified intent map
-
- IntentMap getDefaultQualifiedIntentMap();*/
-
- /**
- * Sets the default qualified intent map.
- *
- * @param defaultQualifiedIntentMap the default qualified intent map
-
- void setDefaultQualifiedIntentMap(IntentMap defaultQualifiedIntentMap);*/
}
Modified: incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java?view=diff&rev=550378&r1=550377&r2=550378
==============================================================================
--- incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java (original)
+++ incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java Sun Jun 24 23:26:45 2007
@@ -43,12 +43,5 @@
* @return a new intent map
*/
IntentMap createIntentMap();
-
- /**
- * Create a new intent map qualifier.
- *
- * @return a new intent map qualifier
- */
- IntentMapQualifier createIntentMapQualifier();
}
Modified: incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java?view=diff&rev=550378&r1=550377&r2=550378
==============================================================================
--- incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java (original)
+++ incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java Sun Jun 24 23:26:45 2007
@@ -64,20 +64,15 @@
* @return
*/
List<Intent> getProvidedIntents();
-
- /**
- * Returns the xpath expression used to determing the SCA Contructs to which this PolicySet applies
- *
- * @return xpath expression string
- */
- String getAppliesTo();
-
+
/**
- * Sets the xpath expression used to determing the SCA Contructs to which this PolicySet applies
+ * Returns the list of SCA constructs that this policy set is meant to
+ * configure.
*
- * @param xpathExp the xpath expression string
+ * @return the list of SCA constructs that this policy set is meant to
+ * configure
*/
- void setAppliesTo(String xpathExp);
+ List<QName> getAppliesTo();
/**
* Returns the list of concrete policies, either WS-Policy policy
@@ -102,12 +97,4 @@
*/
void setUnresolved(boolean unresolved);
- /**
- * Returns the list of SCA constructs that this policy set is meant to
- * configure.
- *
- * @return the list of SCA constructs that this policy set is meant to
- * configure
-
- List<QName> getAppliesTo();*/
}
Modified: incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java?view=diff&rev=550378&r1=550377&r2=550378
==============================================================================
--- incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java (original)
+++ incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java Sun Jun 24 23:26:45 2007
@@ -23,7 +23,6 @@
import javax.xml.namespace.QName;
-import org.apache.tuscany.sca.assembly.Composite;
import org.apache.tuscany.sca.interfacedef.Operation;
import org.apache.tuscany.sca.policy.Intent;
@@ -83,20 +82,5 @@
public void setUnresolved(boolean unresolved) {
this.unresolved = unresolved;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (obj == this) {
- return true;
- } else if (obj instanceof Intent) {
- if (getName() != null) {
- return getName().equals(((Intent)obj).getName());
- } else {
- return ((Intent)obj).getName() == null;
- }
- } else {
- return false;
- }
}
}
Modified: incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java?view=diff&rev=550378&r1=550377&r2=550378
==============================================================================
--- incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java (original)
+++ incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java Sun Jun 24 23:26:45 2007
@@ -20,7 +20,6 @@
import org.apache.tuscany.sca.policy.Intent;
import org.apache.tuscany.sca.policy.IntentMap;
-import org.apache.tuscany.sca.policy.IntentMapQualifier;
import org.apache.tuscany.sca.policy.PolicyFactory;
import org.apache.tuscany.sca.policy.PolicySet;
@@ -41,10 +40,6 @@
public IntentMap createIntentMap() {
return new IntentMapImpl();
- }
-
- public IntentMapQualifier createIntentMapQualifier() {
- return new IntentMapQualifierImpl();
}
}
Modified: incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java?view=diff&rev=550378&r1=550377&r2=550378
==============================================================================
--- incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java (original)
+++ incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java Sun Jun 24 23:26:45 2007
@@ -36,8 +36,7 @@
private QName name;
private List<Operation> operations = new ArrayList<Operation>();
- //private List<QName> appliesTo;
- private String appliesTo;
+ private List<QName> appliesTo;
private List<Intent> providedIntents;
private List<PolicySet> referencedPolicySets;
private List<Object> policies;
@@ -58,9 +57,9 @@
return operations;
}
- /*public List<QName> getAppliesTo() {
+ public List<QName> getAppliesTo() {
return appliesTo;
- }*/
+ }
public List<Intent> getProvidedIntents() {
return providedIntents;
@@ -80,13 +79,5 @@
public void setUnresolved(boolean unresolved) {
this.unresolved = unresolved;
- }
-
- public String getAppliesTo() {
- return appliesTo;
- }
-
- public void setAppliesTo(String xpathExp) {
- this.appliesTo = xpathExp;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org