svn commit: r511934 - in /incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor: ImplementationProcessorServiceImpl.java PropertyProcessor.java

[jboynes]

Author: jboynes
Date: Mon Feb 26 10:01:43 2007
New Revision: 511934

URL: http://svn.apache.org/viewvc?view=rev&rev=511934
Log:
remove use of non-standard xmlType attribute
changed to use SimpleTypeMapper, this may impact use of complex properties

Modified:
    
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ImplementationProcessorServiceImpl.java
    
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/PropertyProcessor.java

Modified: 
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ImplementationProcessorServiceImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ImplementationProcessorServiceImpl.java?view=diff&rev=511934&r1=511933&r2=511934
==============================================================================
--- 
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ImplementationProcessorServiceImpl.java
 (original)
+++ 
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ImplementationProcessorServiceImpl.java
 Mon Feb 26 10:01:43 2007
@@ -25,7 +25,6 @@
 import java.net.URI;
 import java.util.Collection;
 import java.util.List;
-import javax.xml.namespace.QName;
 
 import org.osoa.sca.annotations.Callback;
 import org.osoa.sca.annotations.Property;
@@ -315,14 +314,9 @@
         property.setName(name);
         property.setRequired(propAnnot.required());
 
-        String xmlType = propAnnot.xmlType();
-        if (xmlType != null && xmlType.length() != 0) {
-            property.setXmlType(QName.valueOf(xmlType));
-        } else {
-            TypeInfo typeInfo = typeMapper.getXMLType(property.getJavaType());
-            if (typeInfo != null) {
-                property.setXmlType(typeInfo.getQName());
-            }
+        TypeInfo typeInfo = typeMapper.getXMLType(property.getJavaType());
+        if (typeInfo != null) {
+            property.setXmlType(typeInfo.getQName());
         }
         type.getProperties().put(name, property);
         addName(explicitNames, pos, name);

Modified: 
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/PropertyProcessor.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/PropertyProcessor.java?view=diff&rev=511934&r1=511933&r2=511934
==============================================================================
--- 
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/PropertyProcessor.java
 (original)
+++ 
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/PropertyProcessor.java
 Mon Feb 26 10:01:43 2007
@@ -19,7 +19,6 @@
 package org.apache.tuscany.core.implementation.processor;
 
 import java.lang.reflect.Constructor;
-import javax.xml.namespace.QName;
 
 import org.osoa.sca.annotations.Property;
 
@@ -55,14 +54,9 @@
                                     Property annotation,
                                     DeploymentContext context) {
         property.setRequired(annotation.required());
-        String xmlType = annotation.xmlType();
-        if (xmlType != null && xmlType.length() != 0) {
-            property.setXmlType(QName.valueOf(annotation.xmlType()));
-        } else {
-            TypeInfo type = typeMapper.getXMLType(property.getJavaType());
-            if (type != null) {
-                property.setXmlType(type.getQName());
-            }
+        TypeInfo type = typeMapper.getXMLType(property.getJavaType());
+        if (type != null) {
+            property.setXmlType(type.getQName());
         }
     }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]