diff options
| author | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2010-04-08 12:35:44 +0000 |
|---|---|---|
| committer | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2010-04-08 12:35:44 +0000 |
| commit | 2914b10527d347f80fb16780ca19cdff39161851 (patch) | |
| tree | 1c158ce55dcbae7b97e218659fd90e9e29c74bf7 /sca-java-2.x | |
| parent | 8537ccc9a402b4dc6990aab0650854a27fadda01 (diff) | |
TUSCANY-3527 switch the new message back into the assembly properties file as it causes problems if the same logger is given two different files to retrieve messages from
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@931911 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
3 files changed, 3 insertions, 2 deletions
diff --git a/sca-java-2.x/trunk/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-validation-messages.properties b/sca-java-2.x/trunk/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-validation-messages.properties index bf96eb16df..7958acfec4 100644 --- a/sca-java-2.x/trunk/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-validation-messages.properties +++ b/sca-java-2.x/trunk/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-validation-messages.properties @@ -74,3 +74,4 @@ PropertyHasManyValues = [ASM50032] The property component {0} property {1} has m PropertXSDTypesDontMatch = [ASM_5036] The property component {0} property {1} has XSD type {2} while its component type property has the XSD type {3} PropertXSDElementsDontMatch = [ASM_5036] The property component {0} property {1} has XSD element {2} while its component type property has the XSD element {3} IntentNotSatisfied = The intent {0} associated with policy subject {1} has no matching policy set +URIFoundOnServiceSCABinding = [ASM90005] The SCA binding {0} on component {1} service {2} should not have a URI and the URI is currently set to {3} diff --git a/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentBuilderImpl.java b/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentBuilderImpl.java index c8d60bd021..322db27f05 100644 --- a/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentBuilderImpl.java +++ b/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentBuilderImpl.java @@ -1211,7 +1211,7 @@ public class ComponentBuilderImpl { (binding.getURI().length() > 0)){ Monitor.error(monitor, this, - Messages.BUILDER_VALIDATION_BUNDLE, + Messages.ASSEMBLY_VALIDATION, "URIFoundOnServiceSCABinding", binding.getName(), component.getName(), diff --git a/sca-java-2.x/trunk/modules/builder/src/main/resources/org/apache/tuscany/sca/builder/builder-validation-messages.properties b/sca-java-2.x/trunk/modules/builder/src/main/resources/org/apache/tuscany/sca/builder/builder-validation-messages.properties index f2cfafeda8..0b03843813 100644 --- a/sca-java-2.x/trunk/modules/builder/src/main/resources/org/apache/tuscany/sca/builder/builder-validation-messages.properties +++ b/sca-java-2.x/trunk/modules/builder/src/main/resources/org/apache/tuscany/sca/builder/builder-validation-messages.properties @@ -31,4 +31,4 @@ PolicySetNotFoundAtBuild = PolicySet {0} is not defined in SCA definitions IntentNotSatisfiedAtBuild = The intent {0} associated with policy subject {1} has no matching policy set MutuallyExclusiveIntentsAtBuild = [POL40009,ASM60009,ASM60010] Intent {0} and {1} are mutually exclusive IntentNotFoundAtBuild = Intent {0} is not defined in SCA definitions -URIFoundOnServiceSCABinding = [ASM90005] The SCA binding {0} on component {1} service {2} should not have a URI and the URI is currently set to {3} + |