You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2009/11/11 16:52:20 UTC
svn commit: r834925 - in /tuscany/java/sca/modules/assembly-xml/src/main:
java/org/apache/tuscany/sca/policy/xml/IntentProcessor.java
resources/org/apache/tuscany/sca/policy/xml/policy-xml-validation-messages.properties
Author: slaws
Date: Wed Nov 11 15:52:19 2009
New Revision: 834925
URL: http://svn.apache.org/viewvc?rev=834925&view=rev
Log:
Check that a profile intent doesn't have "." in its name - POL_3006
Modified:
tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentProcessor.java
tuscany/java/sca/modules/assembly-xml/src/main/resources/org/apache/tuscany/sca/policy/xml/policy-xml-validation-messages.properties
Modified: tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentProcessor.java?rev=834925&r1=834924&r2=834925&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentProcessor.java (original)
+++ tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentProcessor.java Wed Nov 11 15:52:19 2009
@@ -121,7 +121,7 @@
intent.setName(new QName(intentLocalName));
intent.setType(Type.valueOf(intentType));
- readRequiredIntents(intent, reader);
+ readRequiredIntents(intent, reader, context);
readExcludedIntents(intent, reader);
readConstrainedTypes(intent, reader);
@@ -352,7 +352,7 @@
}
}
- private void readRequiredIntents(Intent intent, XMLStreamReader reader) {
+ private void readRequiredIntents(Intent intent, XMLStreamReader reader, ProcessorContext context) {
String value = reader.getAttributeValue(null, REQUIRES);
if (value != null) {
List<Intent> requiredIntents = intent.getRequiredIntents();
@@ -363,6 +363,17 @@
required.setUnresolved(true);
requiredIntents.add(required);
}
+
+ // Check that a profile intent does not have "." in its name
+ if (requiredIntents.size() > 0) {
+ if (intent.getName().getLocalPart().contains(".")){
+ Monitor.error(context.getMonitor(),
+ this,
+ Messages.RESOURCE_BUNDLE,
+ "ProfileIntentNameWithPeriod",
+ intent.getName().toString());
+ }
+ }
}
}
Modified: tuscany/java/sca/modules/assembly-xml/src/main/resources/org/apache/tuscany/sca/policy/xml/policy-xml-validation-messages.properties
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xml/src/main/resources/org/apache/tuscany/sca/policy/xml/policy-xml-validation-messages.properties?rev=834925&r1=834924&r2=834925&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly-xml/src/main/resources/org/apache/tuscany/sca/policy/xml/policy-xml-validation-messages.properties (original)
+++ tuscany/java/sca/modules/assembly-xml/src/main/resources/org/apache/tuscany/sca/policy/xml/policy-xml-validation-messages.properties Wed Nov 11 15:52:19 2009
@@ -44,4 +44,4 @@
ConstrainedTypeNotFound = Unable to find the extension type {0} constrained by intent: {1}
MultipleDefaultQualifiers = [POL30004] Intent {0} has more than one qualifier marked as the default qualifier
QualifierIsNotUnique = [POL30005] The intent {0} has more than one qualifier with the name {1}
-
+ProfileIntentNameWithPeriod = [POL30006] The profile intent name {0} must not have the character "." in it