svn commit: r824541 - in /tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor: DefaultStAXArtifactProcessorExtensionPoint.java DefaultStAXAttributeProcessorExtensionPoint.java

[rfeng]

Author: rfeng
Date: Mon Oct 12 23:46:32 2009
New Revision: 824541

URL: http://svn.apache.org/viewvc?rev=824541&view=rev
Log:
Use the getQName from ServiceDeclarationParser

Modified:
    
tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
    
tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXAttributeProcessorExtensionPoint.java

Modified: 
tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java?rev=824541&r1=824540&r2=824541&view=diff
==============================================================================
--- 
tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
 (original)
+++ 
tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
 Mon Oct 12 23:46:32 2009
@@ -35,6 +35,7 @@
 import org.apache.tuscany.sca.core.FactoryExtensionPoint;
 import org.apache.tuscany.sca.core.UtilityExtensionPoint;
 import org.apache.tuscany.sca.extensibility.ServiceDeclaration;
+import org.apache.tuscany.sca.extensibility.ServiceDeclarationParser;
 import org.apache.tuscany.sca.extensibility.ServiceDiscovery;
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
@@ -129,32 +130,6 @@
     }
 
     /**
-     * Returns a QName object from a QName expressed as {ns}name
-     * or ns#name.
-     *
-     * @param qname
-     * @return
-     */
-    private static QName getQName(String qname) {
-        if (qname == null) {
-            return null;
-        }
-        qname = qname.trim();
-        if (qname.startsWith("{")) {
-            int h = qname.indexOf('}');
-            if (h != -1) {
-                return new QName(qname.substring(1, h), qname.substring(h + 
1));
-            }
-        } else {
-            int h = qname.indexOf('#');
-            if (h != -1) {
-                return new QName(qname.substring(0, h), qname.substring(h + 
1));
-            }
-        }
-        throw new IllegalArgumentException("Invalid qname: " + qname);
-    }
-
-    /**
      * Lazily load artifact processors registered in the extension point.
      */
     private synchronized void loadArtifactProcessors() {
@@ -178,7 +153,7 @@
             // Load a StAX artifact processor
 
             // Get the model QName
-            QName artifactType = getQName(attributes.get("qname"));
+            QName artifactType = 
ServiceDeclarationParser.getQName(attributes.get("qname"));
 
             // Get the model class name
             String modelTypeName = attributes.get("model");

Modified: 
tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXAttributeProcessorExtensionPoint.java
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXAttributeProcessorExtensionPoint.java?rev=824541&r1=824540&r2=824541&view=diff
==============================================================================
--- 
tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXAttributeProcessorExtensionPoint.java
 (original)
+++ 
tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXAttributeProcessorExtensionPoint.java
 Mon Oct 12 23:46:32 2009
@@ -35,6 +35,7 @@
 import org.apache.tuscany.sca.core.FactoryExtensionPoint;
 import org.apache.tuscany.sca.core.UtilityExtensionPoint;
 import org.apache.tuscany.sca.extensibility.ServiceDeclaration;
+import org.apache.tuscany.sca.extensibility.ServiceDeclarationParser;
 import org.apache.tuscany.sca.extensibility.ServiceDiscovery;
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
@@ -123,32 +124,6 @@
     }
 
     /**
-     * Returns a QName object from a QName expressed as {ns}name
-     * or ns#name.
-     *
-     * @param qname
-     * @return
-     */
-    private static QName getQName(String qname) {
-        if (qname == null) {
-            return null;
-        }
-        qname = qname.trim();
-        if (qname.startsWith("{")) {
-            int h = qname.indexOf('}');
-            if (h != -1) {
-                return new QName(qname.substring(1, h), qname.substring(h + 
1));
-            }
-        } else {
-            int h = qname.indexOf('#');
-            if (h != -1) {
-                return new QName(qname.substring(0, h), qname.substring(h + 
1));
-            }
-        }
-        throw new IllegalArgumentException("Invalid qname: " + qname);
-    }
-
-    /**
      * Lazily load artifact processors registered in the extension point.
      */
     private synchronized void loadArtifactProcessors() {
@@ -172,7 +147,7 @@
             // Load a StAX artifact processor
 
             // Get the model QName
-            QName artifactType = getQName(attributes.get("qname"));
+            QName artifactType = 
ServiceDeclarationParser.getQName(attributes.get("qname"));
 
             // Get the model class name
             String modelTypeName = attributes.get("model");