TUSCANY-2463 - Merging latest support for extended attributes from 1.x branch

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

2 files changed, 9 insertions, 5 deletions

diff --git a/branches/sca-java-1.3.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java b/branches/sca-java-1.3.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
index bb9f07d946..8f646473b2 100644
--- a/branches/sca-java-1.3.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
+++ b/branches/sca-java-1.3.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
@@ -31,6 +31,7 @@ import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.XMLStreamWriter;
 
 import org.apache.tuscany.sca.assembly.AssemblyFactory;
+import org.apache.tuscany.sca.assembly.ExtensionFactory;
 import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl;
 import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
 import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
@@ -41,11 +42,11 @@ import org.apache.tuscany.sca.core.ExtensionPointRegistry;
 import org.apache.tuscany.sca.core.UtilityExtensionPoint;
 import org.apache.tuscany.sca.extensibility.ServiceDeclaration;
 import org.apache.tuscany.sca.extensibility.ServiceDiscovery;
-import org.apache.tuscany.sca.policy.PolicyFactory;
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
 import org.apache.tuscany.sca.monitor.Problem;
 import org.apache.tuscany.sca.monitor.Problem.Severity;
+import org.apache.tuscany.sca.policy.PolicyFactory;
 
 /**
  * The default implementation of an extension point for StAX artifact processors.
@@ -251,6 +252,7 @@ public class DefaultStAXArtifactProcessorExtensionPoint extends
                     // Specific initialization for the DefaultBeanModelProcessor
                     ModelFactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
                     AssemblyFactory assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
+                    ExtensionFactory extensionFactory = modelFactories.getFactory(ExtensionFactory.class);
                     PolicyFactory policyFactory = modelFactories.getFactory(PolicyFactory.class);
                     try {
                         Class<StAXArtifactProcessor> processorClass =
@@ -264,6 +266,7 @@ public class DefaultStAXArtifactProcessorExtensionPoint extends
                         }
                         Constructor<StAXArtifactProcessor> constructor =
                             processorClass.getConstructor(AssemblyFactory.class,
+                            		                      ExtensionFactory.class,
                                                           PolicyFactory.class,
                                                           QName.class,
                                                           Class.class,
@@ -271,6 +274,7 @@ public class DefaultStAXArtifactProcessorExtensionPoint extends
                                                           Monitor.class);
                         processor =
                             constructor.newInstance(assemblyFactory,
+                            		                extensionFactory,
                                                     policyFactory,
                                                     artifactType,
                                                     getModelType(),
diff --git a/branches/sca-java-1.3.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXAttributeProcessor.java b/branches/sca-java-1.3.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXAttributeProcessor.java
index 29c2af7513..9a5f1b363a 100644
--- a/branches/sca-java-1.3.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXAttributeProcessor.java
+++ b/branches/sca-java-1.3.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXAttributeProcessor.java
@@ -55,7 +55,7 @@ public class ExtensibleStAXAttributeProcessor
 
     private static final Logger logger = Logger.getLogger(ExtensibleStAXAttributeProcessor.class.getName()); 
     
-    private static final QName UNKNOWN_ATTRIBUTE = new QName(Constants.SCA10_TUSCANY_NS, "unknown");
+    private static final QName ANY_ATTRIBUTE = new QName(Constants.XMLSCHEMA_NS, "anyAttribute");
     
     private XMLInputFactory inputFactory;
     private XMLOutputFactory outputFactory;
@@ -149,13 +149,13 @@ public class ExtensibleStAXAttributeProcessor
         
         
         //handle extension attributes without processors
-        processor = (StAXAttributeProcessor<?>)processors.getProcessor(UNKNOWN_ATTRIBUTE);
+        processor = (StAXAttributeProcessor<?>)processors.getProcessor(ANY_ATTRIBUTE);
         if (processor == null) {
         	Location location = source.getLocation();
             if (logger.isLoggable(Level.WARNING)) {                
                 logger.warning("Could not find Default Attribute processor !");
             }
-            warning("DefaultAttributeProcessorNotAvailable", processors, UNKNOWN_ATTRIBUTE, location);            
+            warning("DefaultAttributeProcessorNotAvailable", processors, ANY_ATTRIBUTE, location);            
         }        	
         
         return processor == null ? null : processor.read(attributeName, source);
@@ -181,7 +181,7 @@ public class ExtensibleStAXAttributeProcessor
     	}
     	
     	 //handle extension attributes without processors
-        processor = (StAXAttributeProcessor<?>)processors.getProcessor(UNKNOWN_ATTRIBUTE);
+        processor = (StAXAttributeProcessor<?>)processors.getProcessor(ANY_ATTRIBUTE);
         if(processor == null) {
     		if (logger.isLoggable(Level.WARNING)) {
     			logger.warning("No Default StAX processor is configured to handle " + model.getClass());