Author: rfeng
Date: Tue Oct 6 00:22:26 2009
New Revision: 822095
URL: http://svn.apache.org/viewvc?rev=822095&view=rev
Log:
Refactor resource bundles to a package
Added:
tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Messages.java
(with props)
tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/Messages.java
(with props)
tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/Messages.java
(with props)
tuscany/java/sca/modules/assembly-xml/src/main/resources/org/
tuscany/java/sca/modules/assembly-xml/src/main/resources/org/apache/
tuscany/java/sca/modules/assembly-xml/src/main/resources/org/apache/tuscany/
tuscany/java/sca/modules/assembly-xml/src/main/resources/org/apache/tuscany/sca/
tuscany/java/sca/modules/assembly-xml/src/main/resources/org/apache/tuscany/sca/assembly/
tuscany/java/sca/modules/assembly-xml/src/main/resources/org/apache/tuscany/sca/assembly/xml/
tuscany/java/sca/modules/assembly-xml/src/main/resources/org/apache/tuscany/sca/assembly/xml/assembly-xml-validation-messages.properties
- copied unchanged from r821907,
tuscany/java/sca/modules/assembly-xml/src/main/resources/assembly-xml-validation-messages.properties
tuscany/java/sca/modules/assembly-xml/src/main/resources/org/apache/tuscany/sca/definitions/
tuscany/java/sca/modules/assembly-xml/src/main/resources/org/apache/tuscany/sca/definitions/xml/
tuscany/java/sca/modules/assembly-xml/src/main/resources/org/apache/tuscany/sca/definitions/xml/definitions-xml-validation-messages.properties
- copied unchanged from r821907,
tuscany/java/sca/modules/assembly-xml/src/main/resources/definitions-xml-validation-messages.properties
tuscany/java/sca/modules/assembly-xml/src/main/resources/org/apache/tuscany/sca/policy/
tuscany/java/sca/modules/assembly-xml/src/main/resources/org/apache/tuscany/sca/policy/xml/
tuscany/java/sca/modules/assembly-xml/src/main/resources/org/apache/tuscany/sca/policy/xml/policy-xml-validation-messages.properties
- copied unchanged from r821907,
tuscany/java/sca/modules/assembly-xml/src/main/resources/policy-xml-validation-messages.properties
Removed:
tuscany/java/sca/modules/assembly-xml/src/main/resources/assembly-xml-validation-messages.properties
tuscany/java/sca/modules/assembly-xml/src/main/resources/definitions-xml-validation-messages.properties
tuscany/java/sca/modules/assembly-xml/src/main/resources/policy-xml-validation-messages.properties
Modified:
tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsDocumentProcessor.java
tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ExtensionTypeProcessor.java
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/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicyProcessor.java
Modified:
tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java?rev=822095&r1=822094&r2=822095&view=diff
==============================================================================
---
tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
(original)
+++
tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
Tue Oct 6 00:22:26 2009
@@ -154,7 +154,7 @@
if (monitor != null) {
Problem problem =
monitor.createProblem(this.getClass().getName(),
- "assembly-xml-validation-messages",
+ Messages.RESOURCE_BUNDLE,
Severity.WARNING,
model,
message,
@@ -174,7 +174,7 @@
if (monitor != null) {
Problem problem =
monitor.createProblem(this.getClass().getName(),
- "assembly-xml-validation-messages",
+ Messages.RESOURCE_BUNDLE,
Severity.ERROR,
model,
message,
@@ -194,7 +194,7 @@
if (monitor != null) {
Problem problem =
monitor.createProblem(this.getClass().getName(),
- "assembly-xml-validation-messages",
+ Messages.RESOURCE_BUNDLE,
Severity.ERROR,
model,
message,
Modified:
tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java?rev=822095&r1=822094&r2=822095&view=diff
==============================================================================
---
tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
(original)
+++
tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
Tue Oct 6 00:22:26 2009
@@ -54,7 +54,7 @@
if (old != null) {
Monitor.error(monitor,
this,
- "assembly-xml-validation-messages",
+ Messages.RESOURCE_BUNDLE,
"DuplicateCompositeName",
composite.getName().toString(),
contribution.getLocation());
Added:
tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Messages.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Messages.java?rev=822095&view=auto
==============================================================================
---
tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Messages.java
(added)
+++
tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Messages.java
Tue Oct 6 00:22:26 2009
@@ -0,0 +1,27 @@
+/*
+ * 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.xml;
+
+/**
+ * Constants for resource bundle names
+ */
+public interface Messages {
+ String RESOURCE_BUNDLE =
"org.apache.tuscany.sca.assembly.xml.assembly-xml-validation-messages";
+}
Propchange:
tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Messages.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Messages.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified:
tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsDocumentProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsDocumentProcessor.java?rev=822095&r1=822094&r2=822095&view=diff
==============================================================================
---
tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsDocumentProcessor.java
(original)
+++
tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsDocumentProcessor.java
Tue Oct 6 00:22:26 2009
@@ -85,7 +85,7 @@
if (monitor != null) {
Problem problem =
monitor.createProblem(this.getClass().getName(),
- "definitions-xml-validation-messages",
+ Messages.RESOURCE_BUNDLE,
Severity.ERROR,
model,
message,
Added:
tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/Messages.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/Messages.java?rev=822095&view=auto
==============================================================================
---
tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/Messages.java
(added)
+++
tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/Messages.java
Tue Oct 6 00:22:26 2009
@@ -0,0 +1,27 @@
+/*
+ * 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.definitions.xml;
+
+/**
+ * Constants for resource bundle names
+ */
+public interface Messages {
+ String RESOURCE_BUNDLE =
"org.apache.tuscany.sca.definitions.xml.definitions-xml-validation-messages";
+}
Propchange:
tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/Messages.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/Messages.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified:
tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ExtensionTypeProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ExtensionTypeProcessor.java?rev=822095&r1=822094&r2=822095&view=diff
==============================================================================
---
tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ExtensionTypeProcessor.java
(original)
+++
tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ExtensionTypeProcessor.java
Tue Oct 6 00:22:26 2009
@@ -75,7 +75,7 @@
if (monitor != null) {
Problem problem =
monitor.createProblem(this.getClass().getName(),
- "policy-xml-validation-messages",
+ Messages.RESOURCE_BUNDLE,
Severity.ERROR,
model,
message,
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=822095&r1=822094&r2=822095&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
Tue Oct 6 00:22:26 2009
@@ -80,7 +80,7 @@
if (monitor != null) {
Problem problem =
monitor.createProblem(this.getClass().getName(),
- "policy-xml-validation-messages",
+ Messages.RESOURCE_BUNDLE,
Severity.ERROR,
model,
message,
@@ -93,7 +93,7 @@
if (monitor != null) {
Problem problem =
monitor.createProblem(this.getClass().getName(),
- "policy-xml-validation-messages",
+ Messages.RESOURCE_BUNDLE,
Severity.WARNING,
model,
message,
Added:
tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/Messages.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/Messages.java?rev=822095&view=auto
==============================================================================
---
tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/Messages.java
(added)
+++
tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/Messages.java
Tue Oct 6 00:22:26 2009
@@ -0,0 +1,27 @@
+/*
+ * 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.policy.xml;
+
+/**
+ * Constants for resource bundle names
+ */
+public interface Messages {
+ String RESOURCE_BUNDLE =
"org.apache.tuscany.sca.policy.xml.policy-xml-validation-messages";
+}
Propchange:
tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/Messages.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/Messages.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified:
tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java?rev=822095&r1=822094&r2=822095&view=diff
==============================================================================
---
tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
(original)
+++
tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
Tue Oct 6 00:22:26 2009
@@ -100,7 +100,7 @@
if (monitor != null) {
Problem problem =
monitor.createProblem(this.getClass().getName(),
- "policy-xml-validation-messages",
+ Messages.RESOURCE_BUNDLE,
Severity.ERROR,
model,
message,
@@ -120,7 +120,7 @@
if (monitor != null) {
Problem problem =
monitor.createProblem(this.getClass().getName(),
- "policy-xml-validation-messages",
+ Messages.RESOURCE_BUNDLE,
Severity.ERROR,
model,
message,
Modified:
tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicyProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicyProcessor.java?rev=822095&r1=822094&r2=822095&view=diff
==============================================================================
---
tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicyProcessor.java
(original)
+++
tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicyProcessor.java
Tue Oct 6 00:22:26 2009
@@ -27,6 +27,7 @@
import javax.xml.stream.XMLStreamWriter;
import org.apache.tuscany.sca.assembly.xml.Constants;
+import org.apache.tuscany.sca.assembly.xml.Messages;
import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor;
import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
import
org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
@@ -63,7 +64,7 @@
*/
protected void warning(String message, Object model, String...
messageParameters) {
if (monitor != null){
- Problem problem = monitor.createProblem(this.getClass().getName(),
"assembly-xml-validation-messages", Severity.WARNING, model, message,
(Object[])messageParameters);
+ Problem problem = monitor.createProblem(this.getClass().getName(),
Messages.RESOURCE_BUNDLE, Severity.WARNING, model, message,
(Object[])messageParameters);
monitor.problem(problem);
}
}
@@ -77,7 +78,7 @@
*/
protected void error(String message, Object model, Object...
messageParameters) {
if (monitor != null) {
- Problem problem = monitor.createProblem(this.getClass().getName(),
"assembly-xml-validation-messages", Severity.ERROR, model, message,
(Object[])messageParameters);
+ Problem problem = monitor.createProblem(this.getClass().getName(),
Messages.RESOURCE_BUNDLE, Severity.ERROR, model, message,
(Object[])messageParameters);
monitor.problem(problem);
}
}
