Author: rfeng
Date: Mon Oct 5 19:39:15 2009
New Revision: 821984
URL: http://svn.apache.org/viewvc?rev=821984&view=rev
Log:
Refactor resource bundles to a package
Added:
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Messages.java
(with props)
tuscany/java/sca/modules/assembly/src/main/resources/org/
tuscany/java/sca/modules/assembly/src/main/resources/org/apache/
tuscany/java/sca/modules/assembly/src/main/resources/org/apache/tuscany/
tuscany/java/sca/modules/assembly/src/main/resources/org/apache/tuscany/sca/
tuscany/java/sca/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/
tuscany/java/sca/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/
tuscany/java/sca/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-conformance-messages.properties
- copied unchanged from r821907,
tuscany/java/sca/modules/assembly/src/main/resources/assembly-conformance-messages.properties
tuscany/java/sca/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-validation-messages.properties
- copied, changed from r821907,
tuscany/java/sca/modules/assembly/src/main/resources/assembly-validation-messages.properties
tuscany/java/sca/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-validation-messages_it.properties
- copied unchanged from r821907,
tuscany/java/sca/modules/assembly/src/main/resources/assembly-validation-messages_it.properties
tuscany/java/sca/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/definitions-validation-messages.properties
- copied unchanged from r821907,
tuscany/java/sca/modules/assembly/src/main/resources/definitions-validation-messages.properties
Removed:
tuscany/java/sca/modules/assembly/src/main/resources/assembly-conformance-messages.properties
tuscany/java/sca/modules/assembly/src/main/resources/assembly-validation-messages.properties
tuscany/java/sca/modules/assembly/src/main/resources/assembly-validation-messages_it.properties
tuscany/java/sca/modules/assembly/src/main/resources/definitions-validation-messages.properties
Modified:
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/util/DefinitionsUtil.java
tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/BaseBuilderImpl.java
tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/BindingURIBuilderImpl.java
tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentBuilderImpl.java
tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositeComponentTypeBuilderImpl.java
tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositeIncludeBuilderImpl.java
tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositePolicyBuilderImpl.java
tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointReferenceBuilderImpl.java
tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ReferenceConfigurationUtil.java
tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/StructuralURIBuilderImpl.java
Added:
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Messages.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Messages.java?rev=821984&view=auto
==============================================================================
---
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Messages.java
(added)
+++
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Messages.java
Mon Oct 5 19:39:15 2009
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.tuscany.sca.assembly.builder;
+
+/**
+ * Constants for resource bundle names
+ */
+public interface Messages {
+ String RESOURCE_PACKAGE = "org.apache.tuscany.sca.assembly.builder.";
+ String ASSEMBLY_VALIDATION = RESOURCE_PACKAGE +
"assembly-validation-messages";
+ String ASSEMBLY_CONFORMANCE = RESOURCE_PACKAGE +
"assembly-conformance-messages";
+ String DEFINITIONS_VALIDATION = RESOURCE_PACKAGE +
"definitions-validation-messages";
+}
Propchange:
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Messages.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Messages.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified:
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/util/DefinitionsUtil.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/util/DefinitionsUtil.java?rev=821984&r1=821983&r2=821984&view=diff
==============================================================================
---
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/util/DefinitionsUtil.java
(original)
+++
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/util/DefinitionsUtil.java
Mon Oct 5 19:39:15 2009
@@ -19,6 +19,8 @@
package org.apache.tuscany.sca.definitions.util;
+import static
org.apache.tuscany.sca.assembly.builder.Messages.DEFINITIONS_VALIDATION;
+
import java.util.HashSet;
import org.apache.tuscany.sca.definitions.Definitions;
@@ -49,7 +51,7 @@
if (intents.contains(intent)){
Monitor.error(monitor,
target,
- "definitions-validation-messages",
+ DEFINITIONS_VALIDATION,
"DuplicateIntent",
intent.getName().toString());
} else {
@@ -62,7 +64,7 @@
if (policySets.contains(policySet)){
Monitor.error(monitor,
target,
- "definitions-validation-messages",
+ DEFINITIONS_VALIDATION,
"DuplicatePolicySet",
policySet.getName().toString());
} else {
@@ -75,7 +77,7 @@
if (bindingTypes.contains(bindingType)){
Monitor.error(monitor,
target,
- "definitions-validation-messages",
+ DEFINITIONS_VALIDATION,
"DuplicateBindingType",
bindingType.getType().toString());
} else {
@@ -88,7 +90,7 @@
if (implementationTypes.contains(implementationType)){
Monitor.error(monitor,
target,
- "definitions-validation-messages",
+ DEFINITIONS_VALIDATION,
"DuplicateImplementationType",
implementationType.getType().toString());
} else {
Copied:
tuscany/java/sca/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-validation-messages.properties
(from r821907,
tuscany/java/sca/modules/assembly/src/main/resources/assembly-validation-messages.properties)
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-validation-messages.properties?p2=tuscany/java/sca/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-validation-messages.properties&p1=tuscany/java/sca/modules/assembly/src/main/resources/assembly-validation-messages.properties&r1=821907&r2=821984&rev=821984&view=diff
==============================================================================
---
tuscany/java/sca/modules/assembly/src/main/resources/assembly-validation-messages.properties
(original)
+++
tuscany/java/sca/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-validation-messages.properties
Mon Oct 5 19:39:15 2009
@@ -68,4 +68,5 @@
PropertySourceXPathInvalid = The property file {0} for property {1} in
component {2} is an invalid value. The following error was returned while
processing the file name: {3}
PolicyRelatedException = Policy Related Exception occured due to : {0}
IntentNotFound = Intent {0} is not defined in SCA definitions
+PolicySetNotFound = PolicySet {0} is not defined in SCA definitions
MutuallyExclusiveIntents = Intent {0} and {1} are mutually exclusive [POL40009]
\ No newline at end of file
Modified:
tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/BaseBuilderImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/BaseBuilderImpl.java?rev=821984&r1=821983&r2=821984&view=diff
==============================================================================
---
tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/BaseBuilderImpl.java
(original)
+++
tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/BaseBuilderImpl.java
Mon Oct 5 19:39:15 2009
@@ -40,6 +40,7 @@
import org.apache.tuscany.sca.assembly.Service;
import org.apache.tuscany.sca.assembly.builder.BuilderExtensionPoint;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
+import org.apache.tuscany.sca.assembly.builder.Messages;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
import org.apache.tuscany.sca.core.FactoryExtensionPoint;
import org.apache.tuscany.sca.core.UtilityExtensionPoint;
@@ -111,7 +112,7 @@
if (monitor != null) {
Problem problem =
monitor.createProblem(this.getClass().getName(),
- "assembly-validation-messages",
+ Messages.ASSEMBLY_VALIDATION,
Severity.WARNING,
model,
message,
@@ -132,7 +133,7 @@
if (monitor != null) {
Problem problem =
monitor.createProblem(this.getClass().getName(),
- "assembly-validation-messages",
+ Messages.ASSEMBLY_VALIDATION,
Severity.ERROR,
model,
message,
@@ -153,7 +154,7 @@
Problem problem = null;
problem =
monitor.createProblem(this.getClass().getName(),
- "assembly-validation-messages",
+ Messages.ASSEMBLY_VALIDATION,
Severity.ERROR,
model,
message,
Modified:
tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/BindingURIBuilderImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/BindingURIBuilderImpl.java?rev=821984&r1=821983&r2=821984&view=diff
==============================================================================
---
tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/BindingURIBuilderImpl.java
(original)
+++
tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/BindingURIBuilderImpl.java
Mon Oct 5 19:39:15 2009
@@ -35,6 +35,7 @@
import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
import org.apache.tuscany.sca.assembly.builder.DeployedCompositeBuilder;
+import org.apache.tuscany.sca.assembly.builder.Messages;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
import org.apache.tuscany.sca.definitions.Definitions;
import org.apache.tuscany.sca.monitor.Monitor;
@@ -279,7 +280,7 @@
} catch (URISyntaxException ex) {
Monitor.error(monitor,
this,
- "assembly-validation-messages",
+ Messages.ASSEMBLY_VALIDATION,
"URLSyntaxException",
componentURIString,
service.getName(),
Modified:
tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentBuilderImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentBuilderImpl.java?rev=821984&r1=821983&r2=821984&view=diff
==============================================================================
---
tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentBuilderImpl.java
(original)
+++
tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentBuilderImpl.java
Mon Oct 5 19:39:15 2009
@@ -53,6 +53,7 @@
import org.apache.tuscany.sca.assembly.Service;
import org.apache.tuscany.sca.assembly.builder.BuilderExtensionPoint;
import org.apache.tuscany.sca.assembly.builder.ImplementationBuilder;
+import org.apache.tuscany.sca.assembly.builder.Messages;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
import org.apache.tuscany.sca.core.FactoryExtensionPoint;
import org.apache.tuscany.sca.core.UtilityExtensionPoint;
@@ -306,7 +307,7 @@
if (componentProperty.isMustSupply() &&
!isPropertyValueSet(componentProperty)) {
Monitor.error(monitor,
this,
- "assembly-validation-messages",
+ Messages.ASSEMBLY_VALIDATION,
"PropertyMustSupplyNull",
component.getName(),
componentProperty.getName());
@@ -323,7 +324,7 @@
if (service !=
component.getImplementation().getService(service.getName())){
Monitor.error(monitor,
this,
- "assembly-validation-messages",
+ Messages.ASSEMBLY_VALIDATION,
"DuplicateImplementationServiceName",
component.getName(),
service.getName());
@@ -353,7 +354,7 @@
if (reference !=
component.getImplementation().getReference(reference.getName())){
Monitor.error(monitor,
this,
- "assembly-validation-messages",
+ Messages.ASSEMBLY_VALIDATION,
"DuplicateImplementationReferenceName",
component.getName(),
reference.getName());
@@ -383,7 +384,7 @@
if (property !=
component.getImplementation().getProperty(property.getName())){
Monitor.error(monitor,
this,
- "assembly-validation-messages",
+ Messages.ASSEMBLY_VALIDATION,
"DuplicateImplementationPropertyName",
component.getName(),
property.getName());
@@ -415,7 +416,7 @@
if (componentService !=
component.getService(componentService.getName())){
Monitor.error(monitor,
this,
- "assembly-validation-messages",
+ Messages.ASSEMBLY_VALIDATION,
"DuplicateComponentServiceName",
component.getName(),
componentService.getName());
@@ -437,7 +438,7 @@
} else {
Monitor.error(monitor,
this,
- "assembly-validation-messages",
+ Messages.ASSEMBLY_VALIDATION,
"ServiceNotFoundForComponentService",
component.getName(),
componentService.getName());
@@ -453,7 +454,7 @@
if (componentReference !=
component.getReference(componentReference.getName())){
Monitor.error(monitor,
this,
- "assembly-validation-messages",
+ Messages.ASSEMBLY_VALIDATION,
"DuplicateComponentReferenceName",
component.getName(),
componentReference.getName());
@@ -475,7 +476,7 @@
} else {
Monitor.error(monitor,
this,
- "assembly-validation-messages",
+ Messages.ASSEMBLY_VALIDATION,
"ReferenceNotFoundForComponentReference",
component.getName(),
componentReference.getName());
@@ -490,7 +491,7 @@
if (componentProperty !=
component.getProperty(componentProperty.getName())){
Monitor.error(monitor,
this,
- "assembly-validation-messages",
+ Messages.ASSEMBLY_VALIDATION,
"DuplicateComponentPropertyName",
component.getName(),
componentProperty.getName());
@@ -503,7 +504,7 @@
} else {
Monitor.error(monitor,
this,
- "assembly-validation-messages",
+ Messages.ASSEMBLY_VALIDATION,
"PropertyNotFound",
component.getName(),
componentProperty.getName());
@@ -519,7 +520,7 @@
.getMultiplicity())) {
Monitor.error(monitor,
this,
- "assembly-validation-messages",
+ Messages.ASSEMBLY_VALIDATION,
"ReferenceIncompatibleMultiplicity",
component.getName(),
componentReference.getName());
@@ -538,7 +539,7 @@
if (!componentTypeProperty.isMustSupply() &&
componentProperty.isMustSupply()) {
Monitor.error(monitor,
this,
- "assembly-validation-messages",
+ Messages.ASSEMBLY_VALIDATION,
"PropertyMustSupplyIncompatible",
component.getName(),
componentProperty.getName());
@@ -565,7 +566,7 @@
if (!componentTypeProperty.isMany() && componentProperty.isMany())
{
Monitor.error(monitor,
this,
- "assembly-validation-messages",
+ Messages.ASSEMBLY_VALIDATION,
"PropertyOverrideManyAttribute",
component.getName(),
componentProperty.getName());
@@ -586,7 +587,7 @@
if (componentProperty.getXSDElement() == null &&
componentProperty.getXSDType() == null) {
Monitor.error(monitor,
this,
- "assembly-validation-messages",
+ Messages.ASSEMBLY_VALIDATION,
"NoTypeForComponentProperty",
component.getName(),
componentProperty.getName());
@@ -628,7 +629,7 @@
if (sourceProp == null) {
Monitor.error(monitor,
this,
- "assembly-validation-messages",
+ Messages.ASSEMBLY_VALIDATION,
"PropertySourceNotFound",
source,
componentProperty.getName(),
@@ -650,7 +651,7 @@
} catch (Exception ex) {
Monitor.error(monitor,
this,
- "assembly-validation-messages",
+ Messages.ASSEMBLY_VALIDATION,
"PropertySourceXpathInvalid",
source,
componentProperty.getName(),
@@ -660,7 +661,7 @@
} else {
Monitor.error(monitor,
this,
- "assembly-validation-messages",
+ Messages.ASSEMBLY_VALIDATION,
"PropertySourceValueInvalid",
source,
componentProperty.getName(),
@@ -711,7 +712,7 @@
} catch (Exception ex) {
Monitor.error(monitor,
this,
- "assembly-validation-messages",
+ Messages.ASSEMBLY_VALIDATION,
"PropertyFileValueInvalid",
file,
componentProperty.getName(),
@@ -1043,13 +1044,13 @@
if (topContract instanceof Reference) {
Monitor.error(monitor,
this,
- "assembly-validation-messages",
+ Messages.ASSEMBLY_VALIDATION,
"ReferenceInterfaceNotSubSet",
topContract.getName());
} else {
Monitor.error(monitor,
this,
- "assembly-validation-messages",
+ Messages.ASSEMBLY_VALIDATION,
"ServiceInterfaceNotSubSet",
topContract.getName());
}
Modified:
tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositeComponentTypeBuilderImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositeComponentTypeBuilderImpl.java?rev=821984&r1=821983&r2=821984&view=diff
==============================================================================
---
tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositeComponentTypeBuilderImpl.java
(original)
+++
tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositeComponentTypeBuilderImpl.java
Mon Oct 5 19:39:15 2009
@@ -40,6 +40,7 @@
import org.apache.tuscany.sca.assembly.SCABindingFactory;
import org.apache.tuscany.sca.assembly.Service;
import org.apache.tuscany.sca.assembly.builder.BuilderExtensionPoint;
+import org.apache.tuscany.sca.assembly.builder.Messages;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
import org.apache.tuscany.sca.core.FactoryExtensionPoint;
import org.apache.tuscany.sca.core.UtilityExtensionPoint;
@@ -107,7 +108,7 @@
if (composite.getComponent(component.getName()) == null) {
Monitor.error(monitor,
this,
- "assembly-validation-messages",
+ Messages.ASSEMBLY_VALIDATION,
"DuplicateComponentName",
composite.getName().toString(),
component.getName());
@@ -325,7 +326,7 @@
} else {
Monitor.error(monitor,
this,
- "assembly-validation-messages",
+ Messages.ASSEMBLY_VALIDATION,
"PromotedServiceNotFound",
((Composite)componentType).getName().toString(),
promotedServiceName);
@@ -367,7 +368,7 @@
} else {
Monitor.error(monitor,
this,
- "assembly-validation-messages",
+ Messages.ASSEMBLY_VALIDATION,
"PromotedReferenceNotFound",
((Composite)componentType).getName().toString(),
componentReferenceName);
@@ -427,13 +428,13 @@
if (topContract instanceof Reference) {
Monitor.error(monitor,
this,
- "assembly-validation-messages",
+ Messages.ASSEMBLY_VALIDATION,
"ReferenceInterfaceNotSubSet",
topContract.getName());
} else {
Monitor.error(monitor,
this,
- "assembly-validation-messages",
+ Messages.ASSEMBLY_VALIDATION,
"ServiceInterfaceNotSubSet",
topContract.getName());
}
Modified:
tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositeIncludeBuilderImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositeIncludeBuilderImpl.java?rev=821984&r1=821983&r2=821984&view=diff
==============================================================================
---
tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositeIncludeBuilderImpl.java
(original)
+++
tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositeIncludeBuilderImpl.java
Mon Oct 5 19:39:15 2009
@@ -26,6 +26,7 @@
import org.apache.tuscany.sca.assembly.Service;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
+import org.apache.tuscany.sca.assembly.builder.Messages;
import org.apache.tuscany.sca.definitions.Definitions;
import org.apache.tuscany.sca.monitor.Monitor;
@@ -72,7 +73,7 @@
for (Composite included : composite.getIncludes()) {
if (included.isLocal() && !composite.isLocal()) {
// ASM60041
- Monitor.error(monitor, this,
"assembly-validation-messages", "IllegalCompositeIncusion", composite
+ Monitor.error(monitor, this, Messages.ASSEMBLY_VALIDATION,
"IllegalCompositeIncusion", composite
.getName().toString(), included.getName().toString());
return null;
}
Modified:
tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositePolicyBuilderImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositePolicyBuilderImpl.java?rev=821984&r1=821983&r2=821984&view=diff
==============================================================================
---
tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositePolicyBuilderImpl.java
(original)
+++
tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositePolicyBuilderImpl.java
Mon Oct 5 19:39:15 2009
@@ -260,6 +260,7 @@
policySets.add(definitions.getPolicySets().get(index));
} else {
// PolicySet cannot be resolved
+ warning(monitor, "PolicySetNotFound", subject, policySet);
}
}
}
Modified:
tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointReferenceBuilderImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointReferenceBuilderImpl.java?rev=821984&r1=821983&r2=821984&view=diff
==============================================================================
---
tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointReferenceBuilderImpl.java
(original)
+++
tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointReferenceBuilderImpl.java
Mon Oct 5 19:39:15 2009
@@ -38,6 +38,7 @@
import org.apache.tuscany.sca.assembly.SCABinding;
import org.apache.tuscany.sca.assembly.Wire;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
+import org.apache.tuscany.sca.assembly.builder.Messages;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
import org.apache.tuscany.sca.core.FactoryExtensionPoint;
import org.apache.tuscany.sca.core.UtilityExtensionPoint;
@@ -224,7 +225,7 @@
if (resolvedReference != null) {
wire.setSource(resolvedReference);
} else {
- Monitor.warning(monitor, this,
"assembly-validation-messages", "WireSourceNotFound", source
+ Monitor.warning(monitor, this,
Messages.ASSEMBLY_VALIDATION, "WireSourceNotFound", source
.getName());
}
} else {
@@ -238,7 +239,7 @@
if (resolvedService != null) {
wire.setTarget(target);
} else {
- Monitor.warning(monitor, this,
"assembly-validation-messages", "WireTargetNotFound", target
+ Monitor.warning(monitor, this,
Messages.ASSEMBLY_VALIDATION, "WireTargetNotFound", target
.getName());
}
} else {
@@ -260,7 +261,7 @@
}
resolvedReference.getTargets().add(wire.getTarget());
} else {
- Monitor.warning(monitor, this,
"assembly-validation-messages", "WireIncompatibleInterface", source
+ Monitor.warning(monitor, this,
Messages.ASSEMBLY_VALIDATION, "WireIncompatibleInterface", source
.getName(), target.getName());
}
}
@@ -319,7 +320,7 @@
if (reference.getEndpointReferences().size() == 0) {
Monitor.error(monitor,
this,
- "assembly-validation-messages",
+ Messages.ASSEMBLY_VALIDATION,
"NoComponentReferenceTarget",
reference.getName());
}
@@ -333,7 +334,7 @@
if (bindingsIdentifyTargets(reference)) {
Monitor.error(monitor,
this,
- "assembly-validation-messages",
+ Messages.ASSEMBLY_VALIDATION,
"ReferenceEndPointMixWithTarget",
composite.getName().toString(),
component.getName(),
@@ -383,7 +384,7 @@
reference.getEndpointReferences().add(endpointRef);
Monitor.warning(monitor,
this,
- "assembly-validation-messages",
+ Messages.ASSEMBLY_VALIDATION,
"ComponentReferenceTargetNotFound",
composite.getName().toString(),
targetName);
@@ -401,7 +402,7 @@
} else {
Monitor.error(monitor,
this,
- "assembly-validation-messages",
+ Messages.ASSEMBLY_VALIDATION,
"ReferenceIncompatibleInterface",
composite.getName().toString(),
component.getName() + "." +
reference.getName(),
@@ -416,7 +417,7 @@
reference.getEndpointReferences().add(endpointRef);
Monitor.warning(monitor,
this,
- "assembly-validation-messages",
+ Messages.ASSEMBLY_VALIDATION,
"ComponentReferenceTargetNotFound",
composite.getName().toString(),
targetName);
@@ -509,7 +510,7 @@
reference.getEndpointReferences().add(endpointRef);
Monitor.warning(monitor,
this,
- "assembly-validation-messages",
+ Messages.ASSEMBLY_VALIDATION,
"ComponentReferenceTargetNotFound",
composite.getName().toString(),
targetName);
@@ -528,7 +529,7 @@
} else {
Monitor.warning(monitor,
this,
- "assembly-validation-messages",
+ Messages.ASSEMBLY_VALIDATION,
"ReferenceIncompatibleInterface",
composite.getName().toString(),
reference.getName(),
@@ -571,7 +572,7 @@
if (!promoted && !componentReference.isForCallback() &&
!componentReference.isWiredByImpl()) {
Monitor.error(monitor,
this,
- "assembly-validation-messages",
+ Messages.ASSEMBLY_VALIDATION,
"ReferenceWithoutTargets",
composite.getName().toString(),
componentReference.getName());
@@ -585,7 +586,7 @@
Monitor.error(monitor,
this,
- "assembly-validation-messages",
+ Messages.ASSEMBLY_VALIDATION,
"TooManyReferenceTargets",
componentReference.getName());
}
Modified:
tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ReferenceConfigurationUtil.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ReferenceConfigurationUtil.java?rev=821984&r1=821983&r2=821984&view=diff
==============================================================================
---
tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ReferenceConfigurationUtil.java
(original)
+++
tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ReferenceConfigurationUtil.java
Mon Oct 5 19:39:15 2009
@@ -31,6 +31,7 @@
import org.apache.tuscany.sca.assembly.Multiplicity;
import org.apache.tuscany.sca.assembly.OptimizableBinding;
import org.apache.tuscany.sca.assembly.Reference;
+import org.apache.tuscany.sca.assembly.builder.Messages;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
import org.apache.tuscany.sca.monitor.Problem.Severity;
@@ -53,7 +54,7 @@
if (monitor != null) {
Problem problem =
monitor.createProblem(ReferenceConfigurationUtil.class.getName(),
- "assembly-validation-messages",
+ Messages.ASSEMBLY_VALIDATION,
Severity.WARNING,
model,
message,
Modified:
tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/StructuralURIBuilderImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/StructuralURIBuilderImpl.java?rev=821984&r1=821983&r2=821984&view=diff
==============================================================================
---
tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/StructuralURIBuilderImpl.java
(original)
+++
tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/StructuralURIBuilderImpl.java
Mon Oct 5 19:39:15 2009
@@ -39,6 +39,7 @@
import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
import org.apache.tuscany.sca.assembly.builder.DeployedCompositeBuilder;
+import org.apache.tuscany.sca.assembly.builder.Messages;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
import org.apache.tuscany.sca.definitions.Definitions;
import org.apache.tuscany.sca.monitor.Monitor;
@@ -72,12 +73,12 @@
// Check that multiple bindings do not have the same name
if (existed != null && existed != binding) {
if (contract instanceof Service) {
- Monitor.error(monitor, this,
"assembly-validation-messages", "MultipleBindingsForService", contract
+ Monitor.error(monitor, this, Messages.ASSEMBLY_VALIDATION,
"MultipleBindingsForService", contract
.getName(), binding.getName());
} else {
Monitor.error(monitor,
this,
- "assembly-validation-messages",
+ Messages.ASSEMBLY_VALIDATION,
"MultipleBindingsForReference",
contract.getName(),
binding.getName());
@@ -100,14 +101,14 @@
if (contract instanceof Service) {
Monitor.error(monitor,
this,
- "assembly-validation-messages",
+ Messages.ASSEMBLY_VALIDATION,
"MultipleBindingsForServiceCallback",
contract.getName(),
binding.getName());
} else {
Monitor.error(monitor,
this,
- "assembly-validation-messages",
+ Messages.ASSEMBLY_VALIDATION,
"MultipleBindingsForReferenceCallback",
contract.getName(),
binding.getName());
@@ -196,7 +197,7 @@
} catch (URISyntaxException ex) {
Monitor.error(monitor,
this,
- "assembly-validation-messages",
+ Messages.ASSEMBLY_VALIDATION,
"URLSyntaxException",
componentURIString,
service.getName(),
