Merge changes from the trunk

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@761748 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 33 insertions, 6 deletions

diff --git a/branches/sca-java-2.0-M2/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXAttributeProcessorExtensionPoint.java b/branches/sca-java-2.0-M2/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXAttributeProcessorExtensionPoint.java
index ebad243c1c..dbc0a2c7bc 100644
--- a/branches/sca-java-2.0-M2/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXAttributeProcessorExtensionPoint.java
+++ b/branches/sca-java-2.0-M2/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXAttributeProcessorExtensionPoint.java
@@ -6,24 +6,51 @@
  * 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.    
+ * under the License.
  */
 package org.apache.tuscany.sca.contribution.processor;
 
 /**
  * An extension point for StAX artifact processors.
- * 
+ *
  * @version $Rev$ $Date$
  */
-public interface StAXAttributeProcessorExtensionPoint extends 
-    ArtifactProcessorExtensionPoint<StAXAttributeProcessor> {
+public interface StAXAttributeProcessorExtensionPoint {
+    /**
+     * Add an artifact processor.
+     *
+     * @param artifactProcessor The artifact processor to add
+     */
+    void addArtifactProcessor(StAXAttributeProcessor<?> artifactProcessor);
 
+    /**
+     * Remove an artifact processor.
+     *
+     * @param artifactProcessor The artifact processor to remove
+     */
+    void removeArtifactProcessor(StAXAttributeProcessor<?> artifactProcessor);
+
+    /**
+     * Returns the processor associated with the given artifact type.
+     *
+     * @param artifactType An artifact type
+     * @return The processor associated with the given artifact type
+     */
+    <T> StAXAttributeProcessor<T> getProcessor(Object artifactType);
+
+    /**
+     * Returns the processor associated with the given model type.
+     *
+     * @param modelType A model type
+     * @return The processor associated with the given model type
+     */
+    <T> StAXAttributeProcessor<T> getProcessor(Class<T> modelType);
 }