tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lrese...@apache.org
Subject svn commit: r718858 [7/9] - in /tuscany/java/sca/modules: ./ assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ assembly-xml/src/main/resources/ assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ assembly-xml/src/test/resource...
Date Wed, 19 Nov 2008 05:28:12 GMT
Modified: tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextHelper.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextHelper.java?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextHelper.java (original)
+++ tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextHelper.java Tue Nov 18 21:27:58 2008
@@ -18,7 +18,6 @@
  */
 package org.apache.tuscany.sca.databinding.jaxb;
 
-import java.io.IOException;
 import java.lang.reflect.GenericArrayType;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
@@ -34,15 +33,12 @@
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.JAXBIntrospector;
 import javax.xml.bind.Marshaller;
-import javax.xml.bind.SchemaOutputResolver;
 import javax.xml.bind.Unmarshaller;
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlSchema;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.namespace.QName;
-import javax.xml.transform.Result;
-import javax.xml.transform.dom.DOMResult;
 
 import org.apache.tuscany.sca.databinding.TransformationContext;
 import org.apache.tuscany.sca.databinding.TransformationException;
@@ -53,7 +49,6 @@
 import org.apache.tuscany.sca.interfacedef.Operation;
 import org.apache.tuscany.sca.interfacedef.util.WrapperInfo;
 import org.apache.tuscany.sca.interfacedef.util.XMLType;
-import org.w3c.dom.Node;
 
 /**
  *
@@ -444,25 +439,4 @@
         return name.substring(0, decap).toLowerCase() + name.substring(decap);
     }
 
-    public static Node generateSchema(JAXBContext context) throws Exception {
-        SchemaOutputResolverImpl resolver = new SchemaOutputResolverImpl();
-        context.generateSchema(resolver);
-        return resolver.getSchema();
-    }
-
-    public static class SchemaOutputResolverImpl extends SchemaOutputResolver {
-        private DOMResult result = new DOMResult();
-
-        @Override
-        public Result createOutput(String ns, String file) throws IOException {
-            result.setSystemId("sca:dom");
-            return result;
-        }
-
-        public Node getSchema() {
-            return result != null ? result.getNode() : null;
-        }
-
-    }
-
 }

Modified: tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java (original)
+++ tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java Tue Nov 18 21:27:58 2008
@@ -43,7 +43,6 @@
  */
 public class JAXBDataBinding extends BaseDataBinding {
     public static final String NAME = JAXBElement.class.getName();
-    public static final String[] ALIASES = new String[] {"jaxb"};
 
     public static final String ROOT_NAMESPACE = "http://tuscany.apache.org/xmlns/sca/databinding/jaxb/1.0";
     public static final QName ROOT_ELEMENT = new QName(ROOT_NAMESPACE, "root");
@@ -52,7 +51,7 @@
     private JAXBTypeHelper xmlTypeHelper;
     
     public JAXBDataBinding() {
-        super(NAME, ALIASES, JAXBElement.class);
+        super(NAME, JAXBElement.class);
         this.wrapperHandler = new JAXBWrapperHandler();
         this.xmlTypeHelper = new JAXBTypeHelper();
     }

Modified: tuscany/java/sca/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding (original)
+++ tuscany/java/sca/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding Tue Nov 18 21:27:58 2008
@@ -16,4 +16,4 @@
 # under the License.
 
 # implementation classes for the databindings
-org.apache.tuscany.sca.databinding.jaxb.JAXBDataBinding;type=javax.xml.bind.JAXBElement,name=jaxb
+org.apache.tuscany.sca.databinding.jaxb.JAXBDataBinding;name=javax.xml.bind.JAXBElement

Modified: tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBReflectionTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBReflectionTestCase.java?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBReflectionTestCase.java (original)
+++ tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBReflectionTestCase.java Tue Nov 18 21:27:58 2008
@@ -24,7 +24,6 @@
 import junit.framework.TestCase;
 
 import org.apache.tuscany.sca.databinding.xml.Node2String;
-import org.w3c.dom.Node;
 
 /**
  * @version $Rev$ $Date$
@@ -33,7 +32,7 @@
 
     public void testGenerateSchema() throws Exception {
         JAXBContext context = JAXBContext.newInstance("com.example.ipo.jaxb");
-        Node schema = JAXBContextHelper.generateSchema(context);
-        System.out.println(new Node2String().transform(schema, null));
+        Map<String, String> schemas = JAXBTypeHelper.generateSchema(context);
+        System.out.println(schemas);
     }
 }

Propchange: tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTestCase.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 18 21:27:58 2008
@@ -1,2 +1,4 @@
 /tuscany/branches/sca-java-1.3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTestCase.java.fixme:671193
+/tuscany/branches/sca-java-1.x/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTestCase.java:713805-714043
+/tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTestCase.java:694816-713804
 /tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTestCase.java.fixme:694855

Modified: tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/POJOTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/POJOTestCase.java?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/POJOTestCase.java (original)
+++ tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/POJOTestCase.java Tue Nov 18 21:27:58 2008
@@ -20,6 +20,7 @@
 
 import java.io.StringReader;
 import java.io.StringWriter;
+import java.util.Map;
 
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBElement;
@@ -34,6 +35,24 @@
  * @version $Rev$ $Date$
  */
 public class POJOTestCase extends TestCase {
+    public void testAdapter() throws Exception {
+        JAXBContext context = JAXBContext.newInstance(MyJaxbBean.class, MyInterfaceImpl.class);
+        StringWriter writer = new StringWriter();
+        MyJaxbBean bean = new MyJaxbBean();
+        bean.myBean = new MySubBean();
+        bean.myBean.setName("Ray");
+        bean.myInterface = new MyInterfaceImpl();
+        bean.myInterface.setId("001");
+        bean.myObject = new MyBean();
+        ((MyBean) bean.myObject).setName("Y");
+        context.createMarshaller().marshal(bean, writer);
+        System.out.println(writer.toString());
+        Object result = context.createUnmarshaller().unmarshal(new StringReader(writer.toString()));
+        assertTrue(result instanceof MyJaxbBean);
+        Map<String, String> schemas = JAXBTypeHelper.generateSchema(context);
+        System.out.println(schemas);
+    }
+    
     public void testPOJO() throws Exception {
         JAXBContext context = JAXBContext.newInstance(MyBean.class, MyInterfaceImpl.class);
         StringWriter writer = new StringWriter();
@@ -60,7 +79,7 @@
     }
     
     public void testPOJOArray() throws Exception {
-        JAXBContext context = JAXBContext.newInstance(MyBean[].class);
+        JAXBContext context = JAXBContext.newInstance(MyBean[].class, MySubBean.class);
         StringWriter writer = new StringWriter();
         MySubBean bean = new MySubBean();
         bean.setAddtional("SUB");
@@ -82,7 +101,7 @@
         JAXBElement e2 = (JAXBElement)result;
         assertTrue(e2.getValue() instanceof MyBean[]);
         MyBean newBean = ((MyBean[])e2.getValue())[0];
-        assertFalse(newBean instanceof MySubBean);
+        assertTrue(newBean instanceof MySubBean);
     }
 
     /*

Modified: tuscany/java/sca/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java (original)
+++ tuscany/java/sca/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java Tue Nov 18 21:27:58 2008
@@ -35,13 +35,12 @@
  */
 public class JSONDataBinding extends BaseDataBinding {
     public static final String NAME = "JSON";
-    public static final String[] ALIASES = new String[] {"json"};
 
     public static final String ROOT_NAMESPACE = "http://tuscany.apache.org/xmlns/sca/databinding/json/1.0";
     public static final QName ROOT_ELEMENT = new QName(ROOT_NAMESPACE, "root");
 
     public JSONDataBinding() {
-        super(NAME, ALIASES, org.json.JSONObject.class);
+        super(NAME, org.json.JSONObject.class);
     }
 
     @Override

Modified: tuscany/java/sca/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding (original)
+++ tuscany/java/sca/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding Tue Nov 18 21:27:58 2008
@@ -16,4 +16,4 @@
 # under the License.
 
 # implementation classes for the databindings
-org.apache.tuscany.sca.databinding.json.JSONDataBinding;type=JSON,name=json
\ No newline at end of file
+org.apache.tuscany.sca.databinding.json.JSONDataBinding;name=JSON

Modified: tuscany/java/sca/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding (original)
+++ tuscany/java/sca/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding Tue Nov 18 21:27:58 2008
@@ -16,5 +16,5 @@
 # under the License.
 
 # implementation classes for the databindings
-org.apache.tuscany.sca.databinding.saxon.SaxonNodeDataBinding;type=net.sf.saxon.om.NodeInfo,name=saxon_node
-org.apache.tuscany.sca.databinding.saxon.SaxonValueDataBinding;type=net.sf.saxon.value.Value,name=saxon_value
\ No newline at end of file
+org.apache.tuscany.sca.databinding.saxon.SaxonNodeDataBinding;name=net.sf.saxon.om.NodeInfo
+org.apache.tuscany.sca.databinding.saxon.SaxonValueDataBinding;name=net.sf.saxon.value.Value

Modified: tuscany/java/sca/modules/databinding-sdo-axiom/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding-sdo-axiom/pom.xml?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding-sdo-axiom/pom.xml (original)
+++ tuscany/java/sca/modules/databinding-sdo-axiom/pom.xml Tue Nov 18 21:27:58 2008
@@ -117,7 +117,7 @@
                 <executions>
                     <execution>
                         <id>generate-po-sdo</id>
-                        <phase>generate-sources</phase>
+                        <phase>generate-test-sources</phase>
                         <configuration>
                             <schemaFile>${basedir}/src/test/resources/ipo.xsd</schemaFile>
                             <javaPackage>com.example.ipo.sdo</javaPackage>
@@ -131,7 +131,7 @@
                     </execution>
                     <execution>
                         <id>generate-stock-sdo</id>
-                        <phase>generate-sources</phase>
+                        <phase>generate-test-sources</phase>
                         <configuration>
                             <schemaFile>${basedir}/src/test/resources/stock.xsd</schemaFile>
                             <javaPackage>com.example.stock.sdo</javaPackage>

Modified: tuscany/java/sca/modules/databinding-sdo/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding-sdo/pom.xml?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding-sdo/pom.xml (original)
+++ tuscany/java/sca/modules/databinding-sdo/pom.xml Tue Nov 18 21:27:58 2008
@@ -85,7 +85,7 @@
                 <executions>
                     <execution>
                         <id>generate-po-sdo</id>
-                        <phase>generate-sources</phase>
+                        <phase>generate-test-sources</phase>
                         <configuration>
                             <schemaFile>${basedir}/src/test/resources/ipo.xsd</schemaFile>
                             <javaPackage>com.example.ipo.sdo</javaPackage>
@@ -99,7 +99,7 @@
                     </execution>
                     <execution>
                         <id>generate-stock-sdo</id>
-                        <phase>generate-sources</phase>
+                        <phase>generate-test-sources</phase>
                         <configuration>
                             <schemaFile>${basedir}/src/test/resources/stock.xsd</schemaFile>
                             <javaPackage>com.example.stock.sdo</javaPackage>

Modified: tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java (original)
+++ tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java Tue Nov 18 21:27:58 2008
@@ -24,7 +24,6 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.tuscany.sca.databinding.SimpleTypeMapper;
 import org.apache.tuscany.sca.databinding.WrapperHandler;
 import org.apache.tuscany.sca.databinding.XMLTypeHelper;
 import org.apache.tuscany.sca.databinding.impl.BaseDataBinding;
@@ -46,7 +45,6 @@
  */
 public class SDODataBinding extends BaseDataBinding {
     public static final String NAME = DataObject.class.getName();
-    public static final String[] ALIASES = new String[] {"sdo"};
 
     public static final String ROOT_NAMESPACE = "commonj.sdo";
     public static final QName ROOT_ELEMENT = new QName(ROOT_NAMESPACE, "dataObject");
@@ -55,7 +53,7 @@
     private XMLTypeHelper xmlTypeHelper;
 
     public SDODataBinding() {
-        super(NAME, ALIASES, DataObject.class);
+        super(NAME, DataObject.class);
         wrapperHandler = new SDOWrapperHandler();
         xmlTypeHelper = new SDOTypeHelper();
     }
@@ -123,11 +121,6 @@
     }
 
     @Override
-    public SimpleTypeMapper getSimpleTypeMapper() {
-        return new SDOSimpleTypeMapper();
-    }
-
-    @Override
     public XMLTypeHelper getXMLTypeHelper() {
         // return new SDOTypeHelper();
         return xmlTypeHelper;

Modified: tuscany/java/sca/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding (original)
+++ tuscany/java/sca/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding Tue Nov 18 21:27:58 2008
@@ -16,4 +16,4 @@
 # under the License.
 
 # implementation classes for the databindings
-org.apache.tuscany.sca.databinding.sdo.SDODataBinding;type=commonj.sdo.DataObject,name=sdo
\ No newline at end of file
+org.apache.tuscany.sca.databinding.sdo.SDODataBinding;name=commonj.sdo.DataObject

Modified: tuscany/java/sca/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding (original)
+++ tuscany/java/sca/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding Tue Nov 18 21:27:58 2008
@@ -16,4 +16,4 @@
 # under the License.
 
 # implementation classes for the databindings
-org.apache.tuscany.sca.databinding.xmlbeans.XMLBeansDataBinding;type=org.apache.xmlbeans.XmlObject,name=xmlbeans
\ No newline at end of file
+org.apache.tuscany.sca.databinding.xmlbeans.XMLBeansDataBinding;name=org.apache.xmlbeans.XmlObject

Modified: tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java (original)
+++ tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java Tue Nov 18 21:27:58 2008
@@ -47,13 +47,6 @@
      * @return The name of the databinding
      */
     String getName();
-    
-    /**
-     * Get the aliases for the databinding
-     * 
-     * @return An array of aliases
-     */
-    String[] getAliases();
 
     /**
      * Introspect and populate information to a DataType model
@@ -90,12 +83,6 @@
     Object copy(Object object, DataType dataType, Operation operation);
     
     /**
-     * Get the type mapper for simple types
-     * @return The databinding-specific simple type mapper
-     */
-    SimpleTypeMapper getSimpleTypeMapper();
-    
-    /**
      * Get the XML type helper for Java types
      * @return The databinding-specific XML type helper class
      */

Modified: tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java (original)
+++ tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java Tue Nov 18 21:27:58 2008
@@ -71,17 +71,11 @@
                 className = ((LazyDataBinding)dataBinding).dataBindingDeclaration.getClassName();
                 lazy = true;
             }
-            logger.fine("Adding databinding: " + className + ";type=" + dataBinding.getName() + ",lazy=" + lazy);
+            logger.fine("Adding databinding: " + className + ";name=" + dataBinding.getName() + ",lazy=" + lazy);
         }
         databindings.add(dataBinding);
         bindings.put(dataBinding.getName().toLowerCase(), dataBinding);
 
-        String[] aliases = dataBinding.getAliases();
-        if (aliases != null) {
-            for (String alias : aliases) {
-                bindings.put(alias.toLowerCase(), dataBinding);
-            }
-        }
     }
 
     public DataBinding removeDataBinding(String id) {
@@ -91,12 +85,6 @@
         DataBinding dataBinding = bindings.remove(id.toLowerCase());
         if (dataBinding != null) {
             databindings.remove(dataBinding);
-            String[] aliases = dataBinding.getAliases();
-            if (aliases != null) {
-                for (String alias : aliases) {
-                    bindings.remove(alias.toLowerCase());
-                }
-            }
         }
         return dataBinding;
     }
@@ -119,11 +107,10 @@
         // Load data bindings
         for (ServiceDeclaration dataBindingDeclaration : dataBindingDeclarations) {
             Map<String, String> attributes = dataBindingDeclaration.getAttributes();
-            String type = attributes.get("type");
             String name = attributes.get("name");
 
             // Create a data binding wrapper and register it
-            DataBinding dataBinding = new LazyDataBinding(type, name, dataBindingDeclaration);
+            DataBinding dataBinding = new LazyDataBinding(name, dataBindingDeclaration);
             addDataBinding(dataBinding);
         }
 
@@ -137,15 +124,11 @@
     private static class LazyDataBinding implements DataBinding {
 
         private String name;
-        private String[] aliases;
         private ServiceDeclaration dataBindingDeclaration;
         private DataBinding dataBinding;
 
-        private LazyDataBinding(String type, String name, ServiceDeclaration dataBindingDeclaration) {
+        private LazyDataBinding(String type, ServiceDeclaration dataBindingDeclaration) {
             this.name = type;
-            if (name != null) {
-                this.aliases = new String[] {name};
-            }
             this.dataBindingDeclaration = dataBindingDeclaration;
         }
 
@@ -172,18 +155,10 @@
             return getDataBinding().copy(object, dataType, operation);
         }
 
-        public String[] getAliases() {
-            return aliases;
-        }
-
         public String getName() {
             return name;
         }
 
-        public SimpleTypeMapper getSimpleTypeMapper() {
-            return getDataBinding().getSimpleTypeMapper();
-        }
-
         public XMLTypeHelper getXMLTypeHelper() {
             return getDataBinding().getXMLTypeHelper();
         }

Modified: tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/externalizable/ExternalizableDataBinding.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/externalizable/ExternalizableDataBinding.java?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/externalizable/ExternalizableDataBinding.java (original)
+++ tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/externalizable/ExternalizableDataBinding.java Tue Nov 18 21:27:58 2008
@@ -29,10 +29,9 @@
 public class ExternalizableDataBinding extends BaseDataBinding {
     
     public static final String NAME = java.io.Externalizable.class.getName();
-    public static final String[] ALIASES = new String[] {"externalizable"};
 
     public ExternalizableDataBinding() {
-        super(NAME, ALIASES, java.io.Externalizable.class);
+        super(NAME, java.io.Externalizable.class);
     }
 
     

Modified: tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java (original)
+++ tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java Tue Nov 18 21:27:58 2008
@@ -38,7 +38,6 @@
     private Class<?> baseType;
 
     private String name;
-    private String[] aliases;
 
     /**
      * Create a databinding with the base java type whose name will be used as
@@ -48,7 +47,7 @@
      *            databinding, for example, org.w3c.dom.Node
      */
     protected BaseDataBinding(Class<?> baseType) {
-        this(baseType.getName(), null, baseType);
+        this(baseType.getName(), baseType);
     }
 
     /**
@@ -59,21 +58,8 @@
      *            databinding, for example, org.w3c.dom.Node
      */
     protected BaseDataBinding(String name, Class<?> baseType) {
-        this(name, null, baseType);
-    }
-
-    /**
-     * Create a databinding with the name and base java type
-     * 
-     * @param name The name of the databinding
-     * @param aliases The aliases of the databinding
-     * @param baseType The base java class or interface representing the
-     *            databinding, for example, org.w3c.dom.Node
-     */
-    protected BaseDataBinding(String name, String[] aliases, Class<?> baseType) {
         this.name = name;
         this.baseType = baseType;
-        this.aliases = aliases;
     }
 
     @SuppressWarnings("unchecked")
@@ -118,16 +104,8 @@
         return object;
     }
 
-    public SimpleTypeMapper getSimpleTypeMapper() {
-        return new SimpleTypeMapperImpl();
-    }
-
     public XMLTypeHelper getXMLTypeHelper() {
         return null;
     }
 
-    public String[] getAliases() {
-        return aliases;
-    }
-
 }

Modified: tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java (original)
+++ tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java Tue Nov 18 21:27:58 2008
@@ -40,7 +40,7 @@
     protected Class[] markerTypes;
 
     public GroupDataBinding(Class[] types) {
-        super(NAME, null, GroupDataBinding.class);
+        super(NAME, GroupDataBinding.class);
         this.markerTypes = types;
     }
 

Modified: tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java (original)
+++ tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java Tue Nov 18 21:27:58 2008
@@ -58,7 +58,7 @@
         }
         // HACK: [rfeng] By pass the one know to XMLString
         String db = type.getDataBinding();
-        if (db != null && (XMLStringDataBinding.NAME.equals(db) || XMLStringDataBinding.ALIASES[0].equals(db))) {
+        if (db != null && (XMLStringDataBinding.NAME.equals(db))) {
             return false;
         }
         if (SimpleTypeMapperImpl.JAVA2XML.keySet().contains(cls)) {

Modified: tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java (original)
+++ tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java Tue Nov 18 21:27:58 2008
@@ -35,13 +35,12 @@
  */
 public class DOMDataBinding extends BaseDataBinding {
     public static final String NAME = Node.class.getName();
-    public static final String[] ALIASES = new String[] {"dom"};
 
     public static final String ROOT_NAMESPACE = "http://tuscany.apache.org/xmlns/sca/databinding/dom/1.0";
     public static final QName ROOT_ELEMENT = new QName(ROOT_NAMESPACE, "root");
 
     public DOMDataBinding() {
-        super(NAME, ALIASES, Node.class);
+        super(NAME, Node.class);
     }
 
     @Override

Modified: tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java (original)
+++ tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java Tue Nov 18 21:27:58 2008
@@ -34,10 +34,9 @@
  */
 public class StAXDataBinding extends BaseDataBinding {
     public static final String NAME = XMLStreamReader.class.getName();
-    public static final String[] ALIASES = new String[] {"stax"};
 
     public StAXDataBinding() {
-        super(NAME, ALIASES, XMLStreamReader.class);
+        super(NAME, XMLStreamReader.class);
     }
 
     @Override

Modified: tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLDocumentStreamReader.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLDocumentStreamReader.java?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLDocumentStreamReader.java (original)
+++ tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLDocumentStreamReader.java Tue Nov 18 21:27:58 2008
@@ -50,7 +50,7 @@
 
     private XMLStreamReader realReader;
     private boolean fragment;
-    private int level = 0;
+    private int level = 1;
 
     private int state = STATE_INIT;
 

Modified: tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java (original)
+++ tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java Tue Nov 18 21:27:58 2008
@@ -32,15 +32,14 @@
  */
 public class XMLStringDataBinding extends BaseDataBinding {
     public static final String NAME = String.class.getName();
-    public static final String[] ALIASES = new String[] {"xml.string"};
 
     public XMLStringDataBinding() {
-        super(NAME, ALIASES, String.class);
+        super(NAME, String.class);
     }
 
     @Override
     public boolean introspect(DataType type, Operation operation) {
-        if (type.getPhysical() == String.class && NAME.equals(type.getDataBinding()) || ALIASES[0].equals(type.getDataBinding())) {
+        if (type.getPhysical() == String.class && NAME.equals(type.getDataBinding())) {
             type.setDataBinding(NAME);
             type.setLogical(XMLType.UNKNOWN);
             return true;

Modified: tuscany/java/sca/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding (original)
+++ tuscany/java/sca/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding Tue Nov 18 21:27:58 2008
@@ -16,10 +16,10 @@
 # under the License.
 
 # implementation classes for the databindings
-org.apache.tuscany.sca.databinding.xml.DOMDataBinding;type=org.w3c.dom.Node,name=dom
-org.apache.tuscany.sca.databinding.xml.XMLStringDataBinding;type=java.lang.String,name=xml.string
-org.apache.tuscany.sca.databinding.xml.XMLGroupDataBinding;type=databinding:group
-org.apache.tuscany.sca.databinding.javabeans.JavaBeansDataBinding;type=java:complexType
-org.apache.tuscany.sca.databinding.javabeans.SimpleJavaDataBinding;type=java:simpleType
-org.apache.tuscany.sca.databinding.javabeans.JavaExceptionDataBinding;type=java:exception
-org.apache.tuscany.sca.databinding.externalizable.ExternalizableDataBinding;type=java.io.Externalizable,name=externalizable
+org.apache.tuscany.sca.databinding.xml.DOMDataBinding;name=org.w3c.dom.Node
+org.apache.tuscany.sca.databinding.xml.XMLStringDataBinding;name=java.lang.String
+org.apache.tuscany.sca.databinding.xml.XMLGroupDataBinding;name=databinding:group
+org.apache.tuscany.sca.databinding.javabeans.JavaBeansDataBinding;name=java:complexType
+org.apache.tuscany.sca.databinding.javabeans.SimpleJavaDataBinding;name=java:simpleType
+org.apache.tuscany.sca.databinding.javabeans.JavaExceptionDataBinding;name=java:exception
+org.apache.tuscany.sca.databinding.externalizable.ExternalizableDataBinding;name=java.io.Externalizable

Propchange: tuscany/java/sca/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsDocumentProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 18 21:27:58 2008
@@ -0,0 +1 @@
+/tuscany/java/sca/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsDocumentProcessor.java:694816-713804

Propchange: tuscany/java/sca/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 18 21:27:58 2008
@@ -0,0 +1 @@
+/tuscany/java/sca/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsProcessor.java:694816-713804

Modified: tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerUtil.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerUtil.java?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerUtil.java (original)
+++ tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerUtil.java Tue Nov 18 21:27:58 2008
@@ -23,6 +23,7 @@
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.URLConnection;
 
@@ -124,14 +125,25 @@
      * @throws MalformedURLException
      */
     static URL locationURL(String location) throws MalformedURLException {
-        URI uri = URI.create(location);
-        String scheme = uri.getScheme();
+        String scheme = null; 
+        URI uri = null;
+        
+        IllegalArgumentException uriException = null;
+        try {
+            uri = URI.create(location);
+            scheme = uri.getScheme();
+        }catch (java.lang.IllegalArgumentException e) {
+            uriException = e;
+        }
+        
         if (scheme == null) {
             File file = new File(location);
             return file.toURI().toURL();
         } else if (scheme.equals("file")) {
             File file = new File(location.substring(5));
             return file.toURI().toURL();
+        } else if(uri == null){
+            throw uriException;
         } else {
             return uri.toURL();
         }

Propchange: tuscany/java/sca/modules/extensibility-equinox/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 18 21:27:58 2008
@@ -1,2 +1,3 @@
 /tuscany/branches/sca-java-1.3/modules/extensibility-eclipse:671193,680620-680628
-/tuscany/java/sca/modules/extensibility-equinox:694837-694843,694855
+/tuscany/branches/sca-java-1.x/modules/extensibility-equinox:713805-714043
+/tuscany/java/sca/modules/extensibility-equinox:694816-713804

Propchange: tuscany/java/sca/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscoverer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 18 21:27:58 2008
@@ -1,2 +1,3 @@
 /tuscany/branches/sca-java-1.3/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ClasspathServiceDiscover.java:671193,680620-680628
-/tuscany/java/sca/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscoverer.java:694837-694843,694855
+/tuscany/branches/sca-java-1.x/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscoverer.java:713805-714043
+/tuscany/java/sca/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscoverer.java:694816-713804

Propchange: tuscany/java/sca/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/DefaultCorbaHostTestCase.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 18 21:27:58 2008
@@ -1 +1,2 @@
-/tuscany/java/sca/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/DefaultCorbaHostTestCase.java:694837-694843,694855
+/tuscany/branches/sca-java-1.x/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/DefaultCorbaHostTestCase.java:713805-714043
+/tuscany/java/sca/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/DefaultCorbaHostTestCase.java:694816-713804

Propchange: tuscany/java/sca/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbanameURL.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 18 21:27:58 2008
@@ -1 +1,2 @@
-/tuscany/java/sca/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbanameURL.java:694837-694843,694855
+/tuscany/branches/sca-java-1.x/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbanameURL.java:713805-714043
+/tuscany/java/sca/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbanameURL.java:694816-713804

Modified: tuscany/java/sca/modules/host-webapp/LICENSE
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/host-webapp/LICENSE?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/host-webapp/LICENSE (original)
+++ tuscany/java/sca/modules/host-webapp/LICENSE Tue Nov 18 21:27:58 2008
@@ -201,5 +201,41 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 
+===============================================================================
 
+Apache Tuscany SCA for Java Subcomponents
+=========================================: 
+
+The Tuscany SCA for Java release includes a number of subcomponents with
+separate copyright notices and license terms. Your use of the source
+code for the these subcomponents is subject to the terms and
+conditions of the following licenses.
+
+===============================================================================
+The module host-webapp includes files under the following license:
+
+Permission to copy, display and distribute the Service Component Architecture Specification and/or
+portions thereof, without modification, in any medium without fee or royalty is hereby granted, provided
+that you include the following on ALL copies of the Service Component Architecture Specification, or
+portions thereof, that you make:
+
+1. A link or URL to the Service Component Architecture Specification at this location:
+ยท http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+
+2. The full text of the copyright notice as shown in the Service Component Architecture Specification.
+
+BEA, Cape Clear, IBM, Interface21, IONA, Oracle, Primeton, Progress Software, Red Hat, Rogue Wave,
+SAP, Siemens, Software AG., Sun, Sybase, TIBCO (collectively, the "Authors") agree to grant you a
+royalty-free license, under reasonable, non-discriminatory terms and conditions to patents that they deem
+necessary to implement the Service Component Architecture Specification.
+THE Service Component Architecture SPECIFICATION IS PROVIDED "AS IS," AND THE
+AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
+REGARDING THIS SPECIFICATION AND THE IMPLEMENTATION OF ITS CONTENTS,
+INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE, NON-INFRINGEMENT OR TITLE.
+THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL
+OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR
+DISTRIBUTION OF THE Service Components Architecture SPECIFICATION.
+The name and trademarks of the Authors may NOT be used in any manner, including advertising or
+publicity pertaining to the Service Component Architecture Specification or its contents without specific,
 

Modified: tuscany/java/sca/modules/host-webapp/NOTICE
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/host-webapp/NOTICE?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/host-webapp/NOTICE (original)
+++ tuscany/java/sca/modules/host-webapp/NOTICE Tue Nov 18 21:27:58 2008
@@ -4,3 +4,9 @@
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 
+This product also includes software under the Service Component Architecture specification license
+(see the LICENSE file contained in this distribution) with the following copyright
+
+(c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA
+Technologies, Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens
+AG., Software AG., Sun Microsystems, Inc., Sybase Inc., TIBCO Software Inc., 2005, 2008. All rights reserved.

Modified: tuscany/java/sca/modules/host-webapp/src/main/resources/META-INF/sca.tld
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/host-webapp/src/main/resources/META-INF/sca.tld?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/host-webapp/src/main/resources/META-INF/sca.tld (original)
+++ tuscany/java/sca/modules/host-webapp/src/main/resources/META-INF/sca.tld Tue Nov 18 21:27:58 2008
@@ -1,21 +1,10 @@
 <?xml version = '1.0' encoding = 'ISO-8859-1'?>
 <!--
- * 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.    
+(c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA
+Technologies, Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens
+AG., Software AG., Sun Microsystems, Inc., Sybase Inc., TIBCO Software Inc., 2005, 2008. All rights reserved.
+
+see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  -->
 
 <!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" "http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd">

Propchange: tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 18 21:27:58 2008
@@ -1,2 +1,3 @@
 /tuscany/branches/sca-java-1.3/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider:671193
-/tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider:694837-694843,694855
+/tuscany/branches/sca-java-1.x/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider:713805-714043
+/tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider:694816-713804

Propchange: tuscany/java/sca/modules/implementation-bpel-ode/src/test/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServerTestCase.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 18 21:27:58 2008
@@ -1,2 +1,3 @@
 /tuscany/branches/sca-java-1.3/modules/implementation-bpel-ode/src/test/java/org/apache/tuscany/sca/implementation/bpel/EmbeddedODEServerTestCase.java:671193
-/tuscany/java/sca/modules/implementation-bpel-ode/src/test/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServerTestCase.java:694837-694843,694855
+/tuscany/branches/sca-java-1.x/modules/implementation-bpel-ode/src/test/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServerTestCase.java:713805-714043
+/tuscany/java/sca/modules/implementation-bpel-ode/src/test/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServerTestCase.java:694816-713804

Modified: tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/module/JavaRuntimeModuleActivator.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/module/JavaRuntimeModuleActivator.java?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/module/JavaRuntimeModuleActivator.java (original)
+++ tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/module/JavaRuntimeModuleActivator.java Tue Nov 18 21:27:58 2008
@@ -20,6 +20,8 @@
 package org.apache.tuscany.sca.implementation.java.module;
 
 import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 import org.apache.tuscany.sca.context.ComponentContextFactory;
 import org.apache.tuscany.sca.context.ContextFactoryExtensionPoint;
@@ -51,6 +53,8 @@
  */
 public class JavaRuntimeModuleActivator implements ModuleActivator {
 
+    private static final Logger logger = Logger.getLogger(JavaRuntimeModuleActivator.class.getName());
+
     public JavaRuntimeModuleActivator() {
     }
 
@@ -63,7 +67,11 @@
         InterfaceContractMapper interfaceContractMapper = utilities.getUtility(InterfaceContractMapper.class);
 
         ProxyFactoryExtensionPoint proxyFactories = registry.getExtensionPoint(ProxyFactoryExtensionPoint.class);
-        proxyFactories.setClassProxyFactory(new CglibProxyFactory(messageFactory, interfaceContractMapper));
+        try {
+            proxyFactories.setClassProxyFactory(new CglibProxyFactory(messageFactory, interfaceContractMapper));
+        } catch (NoClassDefFoundError e) {
+            logger.warning("Class proxys not supported due to NoClassDefFoundError:" + e.getMessage());
+        }
 
         JavaInterfaceFactory javaFactory = factories.getFactory(JavaInterfaceFactory.class);
 

Propchange: tuscany/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 18 21:27:58 2008
@@ -1 +1,2 @@
-/tuscany/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java:694837-694843,694855
+/tuscany/branches/sca-java-1.x/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java:713805-714043
+/tuscany/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java:694816-713804

Propchange: tuscany/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 18 21:27:58 2008
@@ -1 +1,2 @@
-/tuscany/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java:694837-694843,694855
+/tuscany/branches/sca-java-1.x/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java:713805-714043
+/tuscany/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java:694816-713804

Propchange: tuscany/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 18 21:27:58 2008
@@ -1 +1,2 @@
-/tuscany/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime:694837-694843,694855
+/tuscany/branches/sca-java-1.x/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime:713805-714043
+/tuscany/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime:694816-713804

Propchange: tuscany/java/sca/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 18 21:27:58 2008
@@ -1 +1,2 @@
-/tuscany/java/sca/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime:694837-694843,694855
+/tuscany/branches/sca-java-1.x/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime:713805-714043
+/tuscany/java/sca/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime:694816-713804

Modified: tuscany/java/sca/modules/implementation-spring/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-spring/pom.xml?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-spring/pom.xml (original)
+++ tuscany/java/sca/modules/implementation-spring/pom.xml Tue Nov 18 21:27:58 2008
@@ -88,19 +88,19 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
-            <version>2.0.8</version>
+            <version>2.5.5</version>
         </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-beans</artifactId>
-            <version>2.0.8</version>
+            <version>2.5.5</version>
         </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
-            <version>2.0.8</version>
+            <version>2.5.5</version>
         </dependency>
     </dependencies>
 

Modified: tuscany/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java (original)
+++ tuscany/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java Tue Nov 18 21:27:58 2008
@@ -18,6 +18,7 @@
  */
 package org.apache.tuscany.sca.implementation.spring;
 
+import java.lang.reflect.Method;
 import java.util.Hashtable;
 import java.util.List;
 
@@ -28,7 +29,9 @@
 import org.apache.tuscany.sca.assembly.Reference;
 import org.apache.tuscany.sca.assembly.Service;
 import org.apache.tuscany.sca.assembly.impl.ImplementationImpl;
+import org.apache.tuscany.sca.implementation.java.impl.JavaConstructorImpl;
 import org.apache.tuscany.sca.implementation.spring.xml.SpringBeanElement;
+import org.apache.tuscany.sca.policy.util.PolicyHandlerTuple;
 import org.springframework.core.io.Resource;
 
 /**
@@ -48,6 +51,14 @@
     private Hashtable<String, SpringBeanElement> serviceMap;
     /** Mapping of property names to Java class **/
     private Hashtable<String, Class> propertyMap;
+    private List<PolicyHandlerTuple> policyHandlerClassNames = null;
+    
+    // Method marked with @Init annotation
+    private Method initMethod = null;
+    // Method marked with @Destroy annotation
+    private Method destroyMethod = null;
+    // Method marked with @Constructor annotation
+    private JavaConstructorImpl<?> constructorDefinition = null;
 
     public SpringImplementation() {
         this.location = null;
@@ -90,6 +101,10 @@
     public Resource getResource() {
         return resource;
     }
+    
+    public JavaConstructorImpl<?> getConstructor() {
+        return constructorDefinition;
+    }
 
     /**
      * Returns the componentType for this Spring implementation
@@ -161,4 +176,12 @@
     public List<Property> getProperties() {
         return componentType.getProperties();
     }
+    
+    public List<PolicyHandlerTuple> getPolicyHandlerClassNames() {
+        return policyHandlerClassNames;
+    }
+
+    public void setPolicyHandlerClassNames(List<PolicyHandlerTuple> policyHandlerClassNames) {
+        this.policyHandlerClassNames = policyHandlerClassNames;
+    } // end method setPolicyHandlerClassNames
 }

Modified: tuscany/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProcessor.java?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProcessor.java (original)
+++ tuscany/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProcessor.java Tue Nov 18 21:27:58 2008
@@ -136,6 +136,9 @@
         	error("LocationAttributeMissing", reader);
             //throw new ContributionReadException(MSG_LOCATION_MISSING);
         }
+        
+        // Read policies
+        policyProcessor.readPolicies(springImplementation, reader);
 
         // Skip to end element
         while (reader.hasNext()) {

Modified: tuscany/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanIntrospector.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanIntrospector.java?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanIntrospector.java (original)
+++ tuscany/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanIntrospector.java Tue Nov 18 21:27:58 2008
@@ -29,6 +29,7 @@
 import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory;
 import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
 import org.apache.tuscany.sca.policy.PolicyFactory;
+import org.apache.tuscany.sca.implementation.spring.SpringImplementation;
 
 /**
  * Provides introspection functions for Spring beans
@@ -67,9 +68,9 @@
      * Spring Bean or its componentType
      *
      */
-    public Map<String, JavaElementImpl> introspectBean(Class<?> beanClass, ComponentType componentType)
-        throws ContributionResolveException {
-
+    public Map<String, JavaElementImpl> introspectBean(Class<?> beanClass, ComponentType componentType,
+                                                       SpringImplementation springImplementation) throws ContributionResolveException 
+    {
         if (componentType == null)
             throw new ContributionResolveException("Introspect Spring bean: supplied componentType is null");
 
@@ -85,6 +86,11 @@
             componentType.getServices().addAll(javaImplementation.getServices());
             componentType.getReferences().addAll(javaImplementation.getReferences());
             componentType.getProperties().addAll(javaImplementation.getProperties());
+            
+            springImplementation.setInitMethod(javaImplementation.getInitMethod());
+            springImplementation.setDestroyMethod(javaImplementation.getDestroyMethod());
+            springImplementation.setConstructor(javaImplementation.getConstructor());
+            
         } catch (IntrospectionException e) {
             throw new ContributionResolveException(e);
         } // end try

Modified: tuscany/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringXMLComponentTypeLoader.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringXMLComponentTypeLoader.java?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringXMLComponentTypeLoader.java (original)
+++ tuscany/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringXMLComponentTypeLoader.java Tue Nov 18 21:27:58 2008
@@ -338,7 +338,7 @@
                     Class<?> beanClass = cl.loadClass(beanElement.getClassName());
                     // Introspect the bean 
                     ComponentType beanComponentType = assemblyFactory.createComponentType();
-                    beanIntrospector.introspectBean(beanClass, beanComponentType);
+                    beanIntrospector.introspectBean(beanClass, beanComponentType, implementation);
                     // Get the service interface defined by this Spring Bean and add to
                     // the component type of the Spring Assembly
                     List<Service> beanServices = beanComponentType.getServices();
@@ -370,7 +370,7 @@
                         // Introspect the bean 
                         ComponentType beanComponentType = assemblyFactory.createComponentType();
                         Map<String, JavaElementImpl> propertyMap =
-                            beanIntrospector.introspectBean(beanClass, beanComponentType);
+                            beanIntrospector.introspectBean(beanClass, beanComponentType, implementation);
                         // Get the references by this Spring Bean and add the unresolved ones to
                         // the component type of the Spring Assembly
                         List<Reference> beanReferences = beanComponentType.getReferences();

Modified: tuscany/java/sca/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationInvoker.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationInvoker.java?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationInvoker.java (original)
+++ tuscany/java/sca/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationInvoker.java Tue Nov 18 21:27:58 2008
@@ -24,12 +24,10 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintWriter;
-import java.net.InetAddress;
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
-import java.net.UnknownHostException;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -122,14 +120,19 @@
         
         for(ComponentReference reference : component.getReferences()) {
             for(Binding binding : reference.getBindings()) {
-                String bindingProxyName = WidgetProxyHelper.getJavaScriptProxyFile(binding.getClass().getName());
+                String [] bindingProxyNames = WidgetProxyHelper.getJavaScriptProxyFile(binding.getClass().getName());
                 //check if binding client code was already processed and inject to the generated script
-                Boolean processedFlag = bindingClientProcessed.get(bindingProxyName);
-                if( processedFlag == null || processedFlag.booleanValue() == false) {
-                    if(bindingProxyName != null) {
-                        generateJavaScriptBindingProxy(pw,bindingProxyName);
-                        bindingClientProcessed.put(bindingProxyName, Boolean.TRUE);
-                    }
+                if ( bindingProxyNames != null ) {
+                	for ( int i = 0; i < bindingProxyNames.length; i++ ) {
+                		String bindingProxyName = bindingProxyNames[ i ];
+                		if(bindingProxyName != null) {
+                			Boolean processedFlag = bindingClientProcessed.get(bindingProxyName);
+                			if( processedFlag == null || processedFlag.booleanValue() == false) {
+                				generateJavaScriptBindingProxy(pw,bindingProxyName);
+                				bindingClientProcessed.put(bindingProxyName, Boolean.TRUE);
+                			}
+                		}
+                }
                 }
             }
         }

Modified: tuscany/java/sca/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetProxyHelper.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetProxyHelper.java?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetProxyHelper.java (original)
+++ tuscany/java/sca/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetProxyHelper.java Tue Nov 18 21:27:58 2008
@@ -27,21 +27,21 @@
  * @version $Rev$ $Date$
  */
 class WidgetProxyHelper {
-    private static Map<String, String> proxyFileRegistry = new HashMap<String, String>();
+    private static Map<String, String[]> proxyFileRegistry = new HashMap<String, String[]>();
     private static Map<String, String> proxyClient = new HashMap<String, String>();
 
     static {
-        proxyFileRegistry.put("org.apache.tuscany.sca.binding.atom.impl.AtomBindingImpl", "binding-atom.js");
+        proxyFileRegistry.put("org.apache.tuscany.sca.binding.atom.impl.AtomBindingImpl", new String[]{ "binding-atom.js", "atomModel.js"});
         proxyClient.put("org.apache.tuscany.sca.binding.atom.impl.AtomBindingImpl", "AtomClient");
 
-        proxyFileRegistry.put("org.apache.tuscany.sca.binding.jsonrpc.impl.JSONRPCBindingImpl", "binding-jsonrpc.js");
+        proxyFileRegistry.put("org.apache.tuscany.sca.binding.jsonrpc.impl.JSONRPCBindingImpl", new String[]{"binding-jsonrpc.js"});
         proxyClient.put("org.apache.tuscany.sca.binding.jsonrpc.impl.JSONRPCBindingImpl", "JSONRpcClient");
 
-        proxyFileRegistry.put("org.apache.tuscany.sca.binding.http.impl.HTTPBindingImpl", "binding-http.js");
+        proxyFileRegistry.put("org.apache.tuscany.sca.binding.http.impl.HTTPBindingImpl", new String[]{"binding-http.js"});
         proxyClient.put("org.apache.tuscany.sca.binding.http.impl.HTTPBindingImpl", "HTTPClient");
     }
 
-    static String getJavaScriptProxyFile(String bindingClass) {
+    static String [] getJavaScriptProxyFile(String bindingClass) {
         return proxyFileRegistry.get(bindingClass);
     }
 



Mime
View raw message