Author: slaws
Date: Thu Apr 8 12:35:44 2010
New Revision: 931911
URL: http://svn.apache.org/viewvc?rev=931911&view=rev
Log:
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
Modified:
tuscany/sca-java-2.x/trunk/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-validation-messages.properties
tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentBuilderImpl.java
tuscany/sca-java-2.x/trunk/modules/builder/src/main/resources/org/apache/tuscany/sca/builder/builder-validation-messages.properties
Modified:
tuscany/sca-java-2.x/trunk/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-validation-messages.properties
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-validation-messages.properties?rev=931911&r1=931910&r2=931911&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-validation-messages.properties
(original)
+++
tuscany/sca-java-2.x/trunk/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-validation-messages.properties
Thu Apr 8 12:35:44 2010
@@ -74,3 +74,4 @@ PropertyHasManyValues = [ASM50032] The p
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}
Modified:
tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentBuilderImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentBuilderImpl.java?rev=931911&r1=931910&r2=931911&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentBuilderImpl.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentBuilderImpl.java
Thu Apr 8 12:35:44 2010
@@ -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(),
Modified:
tuscany/sca-java-2.x/trunk/modules/builder/src/main/resources/org/apache/tuscany/sca/builder/builder-validation-messages.properties
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/builder/src/main/resources/org/apache/tuscany/sca/builder/builder-validation-messages.properties?rev=931911&r1=931910&r2=931911&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/builder/src/main/resources/org/apache/tuscany/sca/builder/builder-validation-messages.properties
(original)
+++
tuscany/sca-java-2.x/trunk/modules/builder/src/main/resources/org/apache/tuscany/sca/builder/builder-validation-messages.properties
Thu Apr 8 12:35:44 2010
@@ -31,4 +31,4 @@ PolicySetNotFoundAtBuild = PolicySet {0}
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}
+
