TUSCANY-2538 - Moving Default element processor to contribution-xml and various other minor fixes

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

6 files changed, 45 insertions, 299 deletions

diff --git a/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Constants.java b/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Constants.java
index 4cf20125b9..14131a9806 100644
--- a/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Constants.java
+++ b/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Constants.java
@@ -25,6 +25,8 @@ package org.apache.tuscany.sca.contribution;
  * @version $Rev$ $Date$
  */
 public interface Constants {
-    String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";
+    String XMLSCHEMA_NS = "http://www.w3.org/2001/XMLSchema";
+    
+	String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";
     String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";
 }
diff --git a/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultUnknownElementProcessor.java b/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultUnknownElementProcessor.java
deleted file mode 100644
index d52a110c05..0000000000
--- a/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultUnknownElementProcessor.java
+++ /dev/null
@@ -1,272 +0,0 @@
-package org.apache.tuscany.sca.contribution.processor;
-
-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
-import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
-
-import java.util.ArrayList;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.xml.namespace.QName;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.Problem.Severity;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.traversal.DocumentTraversal;
-import org.w3c.dom.traversal.NodeFilter;
-import org.w3c.dom.traversal.NodeIterator;
-import org.w3c.dom.traversal.TreeWalker;
-
-public class DefaultUnknownElementProcessor{
-	
-	private Monitor monitor;
-	private static final Logger logger = Logger.getLogger(DefaultUnknownElementProcessor.class.getName());
-	
-	public DefaultUnknownElementProcessor(Monitor monitor){
-		this.monitor = monitor;
-	}
-	private DocumentBuilderFactory documentBuilderFactory;
-	private Document document;
-	
-	/**
-	 * Reads the contetns of the unknown elements and generates the DOM	
-	 * @param reader
-	 * @param name
-	 * @return
-	 * @throws XMLStreamException
-	 */
-	public Object read(XMLStreamReader reader, QName name) throws XMLStreamException{
-		
-		int event = reader.getEventType();
-		int level = 0;
-		ArrayList<String> elementList = new ArrayList<String>();
-		document = createDocument();
-		while(reader.hasNext()){
-	    	switch(event){
-		    	case START_ELEMENT:
-		    		elementList.add(reader.getName().getLocalPart());
-		    		if(level == 0){
-		    			generateDOM(reader,null);
-		    			level++;
-		    		}
-		    		else{
-		    			generateDOM(reader,elementList.get(elementList.size()-2).toString());
-		    		}
-		    		
-		    		break;
-		    	case END_ELEMENT:
-		    		elementList.remove(reader.getName().getLocalPart());
-	    	}
-	    	if(reader.hasNext()){
-	    		event = reader.next();
-	    	}
-	      	
-	      	if(event == START_ELEMENT || event == END_ELEMENT){
-	      		if(reader.getName().equals(name)){
-	      			break;
-	      		}
-	      	}
-	    }
-		return document;
-	}
-
-	/**
-	 * Writes unknown portions back to the writer
-	 * @param model
-	 * @param writer
-	 */
-	public void write(Object model, XMLStreamWriter writer) {
-		
-		if( ! (model instanceof Document)) {
-			return;
-		}
-		
-		Document doc = (Document)model;
-		try{
-			DocumentTraversal traversal = (DocumentTraversal)doc;
-			TreeWalker walker = traversal.createTreeWalker(doc.getDocumentElement(),NodeFilter.SHOW_ALL, null, true);
-			writeDOM(walker,writer);
-		}
-		catch(Exception e){
-			if (logger.isLoggable(Level.SEVERE)) {
-                logger.log(Level.SEVERE, "Document not created ");
-            }
-			error("Document not created",document,e);
-		}
-	}
-
-	/**
-	 * Method to generate the DOM
-	 * @param reader
-	 * @param parent
-	 * @throws Exception 
-	 */
-	//private void generateDOM(String elementText, String parent) {
-	private void generateDOM(XMLStreamReader reader, String parent) {
-		try{
-			String elePrefix = reader.getPrefix();
-			String eleQName = reader.getLocalName();
-			if (elePrefix != null && elePrefix.length() != 0) {
-                eleQName = elePrefix + ":" + eleQName;
-            }
-			
-			Element element = document.createElementNS(reader.getNamespaceURI(), eleQName);
-				
-			int attributeCount = reader.getAttributeCount();
-			for(int i = 0;i < attributeCount;i++){
-				String ns = reader.getAttributeNamespace(i);
-                String prefix = reader.getAttributePrefix(i);
-                String qname = reader.getAttributeLocalName(i);
-                String value = reader.getAttributeValue(i);
-                if (prefix != null && prefix.length() != 0) {
-                    qname = prefix + ":" + qname;
-                }
-                element.setAttributeNS(ns,qname,value);
-			}
-			if(parent == null){
-				if(document != null){
-					document.appendChild(element);
-				}
-				else{
-					if (logger.isLoggable(Level.SEVERE)) {
-	                    logger.log(Level.SEVERE, "Document not created ");
-	                }
-					error("Document not created",document,element);
-				}
-			}
-			else{
-				Node parentNode = getParentNode(document,parent);
-				if(parentNode != null){
-					parentNode.appendChild(element);
-				}
-				else{
-					if (logger.isLoggable(Level.SEVERE)) {
-						logger.log(Level.SEVERE, "Parent node not found");
-					}
-					error("Parent node not found",document,parentNode.getNodeName());
-				}
-			}
-		}
-		catch(Exception e){
-			e.printStackTrace();
-			if (logger.isLoggable(Level.SEVERE)) {
-                logger.log(Level.SEVERE, "Document not created ");
-            }
-			error("Document not created",document,e);
-		}
-	}
-
-	/**
-	 * Method to create an empty document
-	 * @return
-	 */
-	private Document createDocument() {
-		try {
-	        if (documentBuilderFactory == null) {
-	            documentBuilderFactory = DocumentBuilderFactory.newInstance();
-	        }
-	        document = documentBuilderFactory.newDocumentBuilder().newDocument();
-	        return document;
-	    } catch (ParserConfigurationException e) {
-	    	e.printStackTrace();
-	    }
-	    return null;
-	}
-
-	/**
-	 * Method to traverse the DOM structure and write the elements 
-	 * @param walker
-	 * @param writer
-	 * @throws XMLStreamException
-	 */
-	private void writeDOM(TreeWalker walker,XMLStreamWriter writer) throws XMLStreamException {
-	  
-	    Node parent = walker.getCurrentNode();
-	    
-	    writer.writeStartElement(parent.getPrefix(), parent.getLocalName(), parent.getNamespaceURI());
-	    
-	    NamedNodeMap attributes = parent.getAttributes();
-	   
-	    for(int i = 0;i<attributes.getLength();i++){
-		   writer.writeAttribute(attributes.item(i).getPrefix(), attributes.item(i).getNamespaceURI(), attributes.item(i).getLocalName(), attributes.item(i).getNodeValue());
-	    }
-	    	   
-	    for (Node n = walker.firstChild();n != null;n = walker.nextSibling()) {
-	      writeDOM(walker,writer);
-	    }
-	    writer.writeEndElement();
-	    
-	    walker.setCurrentNode(parent);
-	}
-
-	/**
-	 * Method to get the Parent node out of the DOM structure
-	 * @param doc
-	 * @param parent
-	 * @return
-	 */
-	private Node getParentNode(Node doc,String parent) {
-		Node parentNode = null;
-		try{
-			DocumentTraversal traversal = (DocumentTraversal)doc;
-			
-			CharSequence prefixChar = ":";
-			NodeIterator iterator = traversal.createNodeIterator(document.getDocumentElement(), NodeFilter.SHOW_ELEMENT, null, true);
-			for (Node n = iterator.nextNode(); n != null; n = iterator.nextNode()) {
-				String nodeName = n.getNodeName();
-				String[] str = null;
-				if(n.getNodeName().contains(prefixChar)){
-					str = nodeName.split(":");
-					nodeName = str[str.length-1];
-				}
-				if(parent.equalsIgnoreCase(nodeName)){
-			    	  parentNode = n;
-			    	}
-			    }
-			return parentNode;
-		}
-		catch(Exception e){
-			e.printStackTrace();
-		}
-		return parentNode;
-	}
-	
-	 /**
-     * Marshals exceptions into the monitor
-     * 
-     * @param problems
-     * @param message
-     * @param model
-     */
-    private void error(String message, Object model, Exception ex) {
-    	if (monitor != null) {
-	        Problem problem = new ProblemImpl(this.getClass().getName(), "contribution-validation-messages", Severity.ERROR, model, message, ex);
-	        monitor.problem(problem);
-    	}
-    }
-    
-    /**
-     * Report a error.
-     * 
-     * @param problems
-     * @param message
-     * @param model
-     */
-    private void error(String message, Object model, Object... messageParameters) {
-    	if (monitor != null) {
-	        Problem problem = new ProblemImpl(this.getClass().getName(), "contribution-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
-	        monitor.problem(problem);
-    	}
-    }
-	
-}
diff --git a/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java b/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java
index ca5c36fe98..24d2a16bc8 100644
--- a/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java
+++ b/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java
@@ -34,12 +34,12 @@ import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.XMLStreamWriter;
 
 import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl;
+import org.apache.tuscany.sca.contribution.Constants;
 import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
 import org.apache.tuscany.sca.contribution.service.ContributionReadException;
 import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
 import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
 import org.apache.tuscany.sca.contribution.service.UnrecognizedElementException;
-import org.apache.tuscany.sca.contribution.processor.DefaultUnknownElementProcessor;
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.Problem;
 import org.apache.tuscany.sca.monitor.Problem.Severity;
@@ -52,8 +52,9 @@ import org.apache.tuscany.sca.monitor.Problem.Severity;
  * 
  * @version $Rev$ $Date$
  */
-public class ExtensibleStAXArtifactProcessor
-    implements StAXArtifactProcessor<Object> {
+public class ExtensibleStAXArtifactProcessor implements StAXArtifactProcessor<Object> {
+	
+	private static final QName ANY_ELEMENT = new QName(Constants.XMLSCHEMA_NS, "anyElement");
 
     private static final Logger logger = Logger.getLogger(ExtensibleStAXArtifactProcessor.class.getName()); 
     private XMLInputFactory inputFactory;
@@ -134,14 +135,19 @@ public class ExtensibleStAXArtifactProcessor
         QName name = source.getName();
         StAXArtifactProcessor<?> processor = (StAXArtifactProcessor<?>)processors.getProcessor(name);
         if (processor == null) {
-        	DefaultUnknownElementProcessor unknownElementProcessor = new DefaultUnknownElementProcessor(monitor);
         	Location location = source.getLocation();
             if (logger.isLoggable(Level.WARNING)) {                
                 logger.warning("Element " + name + " cannot be processed. (" + location + ")");
             }
             warning("ElementCannotBeProcessed", processors, name, location);
-            //return null;
-        	return unknownElementProcessor.read(source,name);
+
+            StAXArtifactProcessor anyElementProcessor = processors.getProcessor(ANY_ELEMENT);
+            if(anyElementProcessor != null) {
+            	return anyElementProcessor.read(source);	
+            } else {
+            	return null;
+            }
+            
         }
         return processor.read(source);
     }
@@ -155,12 +161,14 @@ public class ExtensibleStAXArtifactProcessor
             if (processor != null) {
                 processor.write(model, outputSource);
             } else {
-            	DefaultUnknownElementProcessor unknownElementProcessor = new DefaultUnknownElementProcessor(monitor);
-            	unknownElementProcessor.write(model,outputSource);
                 if (logger.isLoggable(Level.WARNING)) {
                     logger.warning("No StAX processor is configured to handle " + model.getClass());
                 }
                 warning("NoStaxProcessor", processors, model.getClass());
+                StAXArtifactProcessor anyElementProcessor = processors.getProcessor(ANY_ELEMENT);
+                if(anyElementProcessor != null) {
+                	anyElementProcessor.write(model, outputSource);
+                }
             }
         }
     }
diff --git a/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXAttributeProcessor.java b/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXAttributeProcessor.java
index 3329f0bf1c..29c2af7513 100644
--- a/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXAttributeProcessor.java
+++ b/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXAttributeProcessor.java
@@ -147,6 +147,17 @@ public class ExtensibleStAXAttributeProcessor
         	return processor.read(attributeName, source);
         }
         
+        
+        //handle extension attributes without processors
+        processor = (StAXAttributeProcessor<?>)processors.getProcessor(UNKNOWN_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);            
+        }        	
+        
         return processor == null ? null : processor.read(attributeName, source);
     }
     
@@ -168,6 +179,18 @@ public class ExtensibleStAXAttributeProcessor
     		processor.write(model, outputSource);
     		return;
     	}
+    	
+    	 //handle extension attributes without processors
+        processor = (StAXAttributeProcessor<?>)processors.getProcessor(UNKNOWN_ATTRIBUTE);
+        if(processor == null) {
+    		if (logger.isLoggable(Level.WARNING)) {
+    			logger.warning("No Default StAX processor is configured to handle " + model.getClass());
+    		}
+    		warning("NoDefaultStaxProcessor", processors, model.getClass());    		        	
+        } else {
+    		processor.write(model, outputSource);
+    		return;        	
+        }
     }
     
     
diff --git a/java/sca/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessorExtensionPoint b/java/sca/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessorExtensionPoint
deleted file mode 100644
index 607725bcfe..0000000000
--- a/java/sca/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessorExtensionPoint
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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. 

-

-org.apache.tuscany.sca.contribution.processor.DefaultStAXAttributeProcessorExtensionPoint

diff --git a/java/sca/modules/contribution/src/main/resources/contribution-validation-messages.properties b/java/sca/modules/contribution/src/main/resources/contribution-validation-messages.properties
index bd650fe457..4f9f85048e 100644
--- a/java/sca/modules/contribution/src/main/resources/contribution-validation-messages.properties
+++ b/java/sca/modules/contribution/src/main/resources/contribution-validation-messages.properties
@@ -23,9 +23,12 @@ SchemaFatalError = XMLSchema validation fatal error occured in: {0} ,line = {1},
 SchemaWarning = XMLSchema validation warning occured in: {0} ,line = {1}, column = {2}, Message = {3}
 UnsupportedPackageTypeException = Unsupported contribution package type: {0}
 ElementCannotBeProcessed = Element {0} cannot be processed. ({1})
+AttributeCannotBeProcessed = Attribute {0} cannot be processed. ({1})
 NoStaxProcessor = No StAX processor is configured to handle {0}
 ContributionWriteException = ContributionWriteException occured due to :
 ContributionReadException = ContributionReadException occured due to :
 UnrecognizedElementException = Unrecognized Element : {0}
 IllegalArgumentException = Invalid qname: {0}
 PrivilegedActionException = PrivilegedActionException occured due to : 
+AttributeCannotBeProcessed = Attribute {0} cannot be processed. ({1})
+