You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jm...@apache.org on 2006/08/23 19:58:55 UTC

svn commit: r434106 - in /incubator/tuscany/java/sca/bindings: binding.axis2/ binding.axis2/src/main/assembly/ binding.celtix/ binding.celtix/src/main/assembly/ binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/ binding.celtix/src/main/jav...

Author: jmarino
Date: Wed Aug 23 10:58:54 2006
New Revision: 434106

URL: http://svn.apache.org/viewvc?rev=434106&view=rev
Log:
commit Jervis' patch Tuscany-661 for /sca

Added:
    incubator/tuscany/java/sca/bindings/binding.axis2/src/main/assembly/
    incubator/tuscany/java/sca/bindings/binding.axis2/src/main/assembly/axis2.xml   (with props)
    incubator/tuscany/java/sca/bindings/binding.celtix/src/main/assembly/
    incubator/tuscany/java/sca/bindings/binding.celtix/src/main/assembly/standalone.xml   (with props)
Modified:
    incubator/tuscany/java/sca/bindings/binding.axis2/pom.xml
    incubator/tuscany/java/sca/bindings/binding.celtix/pom.xml
    incubator/tuscany/java/sca/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixBindingBuilder.java
    incubator/tuscany/java/sca/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixService.java
    incubator/tuscany/java/sca/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/WebServiceBindingLoader.java
    incubator/tuscany/java/sca/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/io/NodeDataWriter.java
    incubator/tuscany/java/sca/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/io/SCADataBindingCallback.java

Modified: incubator/tuscany/java/sca/bindings/binding.axis2/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/bindings/binding.axis2/pom.xml?rev=434106&r1=434105&r2=434106&view=diff
==============================================================================
--- incubator/tuscany/java/sca/bindings/binding.axis2/pom.xml (original)
+++ incubator/tuscany/java/sca/bindings/binding.axis2/pom.xml Wed Aug 23 10:58:54 2006
@@ -114,7 +114,8 @@
 
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+             <version>2.3</version>
+           <artifactId>servlet-api</artifactId>
             <scope>provided</scope>
         </dependency>
         <!-- runtime -->
@@ -173,6 +174,7 @@
 
         <dependency>
             <groupId>javax.servlet</groupId>
+            <version>2.3</version>
             <artifactId>servlet-api</artifactId>
         </dependency>
 
@@ -233,4 +235,29 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+    
+            <build>
+                <defaultGoal>install</defaultGoal>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <version>2.2-SNAPSHOT</version>
+                        <executions>
+                            <execution>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>single</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>src/main/assembly/axis2.xml</descriptor>
+                            </descriptors>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+
 </project>

Added: incubator/tuscany/java/sca/bindings/binding.axis2/src/main/assembly/axis2.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/bindings/binding.axis2/src/main/assembly/axis2.xml?rev=434106&view=auto
==============================================================================
--- incubator/tuscany/java/sca/bindings/binding.axis2/src/main/assembly/axis2.xml (added)
+++ incubator/tuscany/java/sca/bindings/binding.axis2/src/main/assembly/axis2.xml Wed Aug 23 10:58:54 2006
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<assembly>
+    <id>bin</id>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <formats>
+        <format>zip</format>
+        <format>tar.gz</format>
+    </formats>
+
+    <dependencySets>
+        <dependencySet>
+            <outputDirectory>extension</outputDirectory>
+            <includes>
+                <include>org.apache.tuscany.bindings:axis2</include>
+            </includes>
+            <fileMode>644</fileMode>
+        </dependencySet>
+    </dependencySets>
+</assembly>
+

Propchange: incubator/tuscany/java/sca/bindings/binding.axis2/src/main/assembly/axis2.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/bindings/binding.axis2/src/main/assembly/axis2.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/tuscany/java/sca/bindings/binding.celtix/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/bindings/binding.celtix/pom.xml?rev=434106&r1=434105&r2=434106&view=diff
==============================================================================
--- incubator/tuscany/java/sca/bindings/binding.celtix/pom.xml (original)
+++ incubator/tuscany/java/sca/bindings/binding.celtix/pom.xml Wed Aug 23 10:58:54 2006
@@ -87,4 +87,29 @@
             <artifactId>wstx-asl</artifactId>
         </dependency>
     </dependencies>
+    
+        <build>
+            <defaultGoal>install</defaultGoal>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-assembly-plugin</artifactId>
+                    <version>2.2-SNAPSHOT</version>
+                    <executions>
+                        <execution>
+                            <phase>package</phase>
+                            <goals>
+                                <goal>single</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                    <configuration>
+                        <descriptors>
+                            <descriptor>src/main/assembly/standalone.xml</descriptor>
+                        </descriptors>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </build>
+
 </project>

Added: incubator/tuscany/java/sca/bindings/binding.celtix/src/main/assembly/standalone.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/bindings/binding.celtix/src/main/assembly/standalone.xml?rev=434106&view=auto
==============================================================================
--- incubator/tuscany/java/sca/bindings/binding.celtix/src/main/assembly/standalone.xml (added)
+++ incubator/tuscany/java/sca/bindings/binding.celtix/src/main/assembly/standalone.xml Wed Aug 23 10:58:54 2006
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<assembly>
+    <id>bin</id>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <formats>
+        <format>zip</format>
+        <format>tar.gz</format>
+    </formats>
+
+    <dependencySets>
+        <dependencySet>
+            <outputDirectory>extension</outputDirectory>
+            <includes>
+                <include>org.apache.tuscany.bindings:celtix</include>
+            </includes>
+            <fileMode>644</fileMode>
+        </dependencySet>
+    </dependencySets>
+</assembly>
+

Propchange: incubator/tuscany/java/sca/bindings/binding.celtix/src/main/assembly/standalone.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/bindings/binding.celtix/src/main/assembly/standalone.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/tuscany/java/sca/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixBindingBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixBindingBuilder.java?rev=434106&r1=434105&r2=434106&view=diff
==============================================================================
--- incubator/tuscany/java/sca/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixBindingBuilder.java (original)
+++ incubator/tuscany/java/sca/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixBindingBuilder.java Wed Aug 23 10:58:54 2006
@@ -6,15 +6,15 @@
  * 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.    
+ * under the License.
  */
 package org.apache.tuscany.binding.celtix;
 
@@ -32,7 +32,7 @@
 import org.objectweb.celtix.Bus;
 
 /**
- * Builds a {@link Service} or {@link org.apache.tuscany.spi.component.Reference} configured 
+ * Builds a {@link Service} or {@link org.apache.tuscany.spi.component.Reference} configured
  * with the Celtix binding
  *
  * @version $Rev$ $Date$
@@ -44,8 +44,6 @@
     public SCAObject build(CompositeComponent parent,
                            BoundServiceDefinition<WebServiceBinding> boundServiceDefinition,
                            DeploymentContext deploymentContext) {
-        //FIXME: CeltixService needs an instance of BusService. How to get BusService wired in 
-        //and where BusService is created?
         WebServiceBinding wsBinding = boundServiceDefinition.getBinding();
         if (bus == null) {
             bus = getBus(wsBinding.getWSDLDefinitionRegistry());
@@ -78,13 +76,13 @@
     protected Class<WebServiceBinding> getBindingType() {
         return WebServiceBinding.class;
     }
-    
+
     private Bus getBus(WSDLDefinitionRegistry wsdlDefinitionRegistry) {
         Bus celtixBus = null;
         try {
             Map<String, Object> properties = new WeakHashMap<String, Object>();
             properties.put("celtix.WSDLManager", new TuscanyWSDLManager(wsdlDefinitionRegistry));
-            bus = Bus.init(new String[0], properties);
+            celtixBus = Bus.init(new String[0], properties);
         } catch (Exception e) {
             e.printStackTrace();
         }

Modified: incubator/tuscany/java/sca/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixService.java?rev=434106&r1=434105&r2=434106&view=diff
==============================================================================
--- incubator/tuscany/java/sca/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixService.java (original)
+++ incubator/tuscany/java/sca/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixService.java Wed Aug 23 10:58:54 2006
@@ -6,15 +6,15 @@
  * 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.    
+ * under the License.
  */
 package org.apache.tuscany.binding.celtix;
 
@@ -140,9 +140,16 @@
         }
 
         try {
+            //FIXME: This hack is because SAAJImpl uses Thread.currentThread().getContextClassLoader(),
+            //this classloader is different from current classLoader.
+            ClassLoader previousLoader = Thread.currentThread().getContextClassLoader();
+            Thread.currentThread().setContextClassLoader(this.getClass().getClassLoader());
+
             ServerBinding serverBinding = bus.getBindingManager()
                 .getBindingFactory(bindingId).createServerBinding(reference, this);
             serverBinding.activate();
+
+            Thread.currentThread().setContextClassLoader(previousLoader);
         } catch (Exception e) {
             throw new CeltixServiceInitException(e);
         }

Modified: incubator/tuscany/java/sca/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/WebServiceBindingLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/WebServiceBindingLoader.java?rev=434106&r1=434105&r2=434106&view=diff
==============================================================================
--- incubator/tuscany/java/sca/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/WebServiceBindingLoader.java (original)
+++ incubator/tuscany/java/sca/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/WebServiceBindingLoader.java Wed Aug 23 10:58:54 2006
@@ -6,31 +6,37 @@
  * 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.    
+ * under the License.
  */
 package org.apache.tuscany.binding.celtix;
 
+
+import java.io.IOException;
+import java.net.URL;
 import java.util.Collection;
+import java.util.LinkedList;
 import java.util.List;
 import javax.wsdl.Definition;
 import javax.wsdl.Port;
 import javax.wsdl.Service;
+import javax.wsdl.WSDLException;
+import javax.wsdl.factory.WSDLFactory;
+import javax.wsdl.xml.WSDLReader;
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 
-import static org.osoa.sca.Version.XML_NAMESPACE_1_0;
-import org.osoa.sca.annotations.Constructor;
-import org.osoa.sca.annotations.Scope;
-
+import org.apache.tuscany.idl.wsdl.WSDLDefinitionRegistry;
+import org.apache.tuscany.idl.wsdl.WSDLDefinitionRegistryImpl;
+import org.apache.tuscany.idl.wsdl.WSDLDefinitionRegistryImpl.Monitor;
 import org.apache.tuscany.spi.annotation.Autowire;
 import org.apache.tuscany.spi.component.CompositeComponent;
 import org.apache.tuscany.spi.deployer.DeploymentContext;
@@ -38,7 +44,10 @@
 import org.apache.tuscany.spi.loader.LoaderException;
 import org.apache.tuscany.spi.loader.LoaderRegistry;
 
-import org.apache.tuscany.idl.wsdl.WSDLDefinitionRegistry;
+import org.osoa.sca.annotations.Constructor;
+import org.osoa.sca.annotations.Scope;
+import org.xml.sax.InputSource;
+import static org.osoa.sca.Version.XML_NAMESPACE_1_0;
 
 /**
  * Parses a <code>WebServiceBinding</code> entry in an assembly XML file
@@ -51,11 +60,28 @@
 
     protected WSDLDefinitionRegistry wsdlRegistry;
 
-    @Constructor({"registry", "wsdlregistry"})
+    @Constructor({"registry", "wsdlregistry" })
     public WebServiceBindingLoader(@Autowire LoaderRegistry registry,
-                                   @Autowire WSDLDefinitionRegistry wsdlRegistry) {
+                                   @Autowire WSDLDefinitionRegistry theWsdlRegistry) {
         super(registry);
-        this.wsdlRegistry = wsdlRegistry;
+        this.wsdlRegistry = theWsdlRegistry;
+
+        //FIXME:  this is a  hack, WSDLDefinitionRegistry should not be created here
+        if (wsdlRegistry == null) {
+            try {
+                wsdlRegistry = new WSDLDefinitionRegistryImpl();
+                Monitor monitor = new Monitor() {
+                    public void readingWSDL(String namespace, URL location) {
+                    }
+                    public void cachingDefinition(String namespace, URL location) {
+                    }
+                };
+
+                ((WSDLDefinitionRegistryImpl)wsdlRegistry).setMonitor(monitor);
+            } catch (javax.wsdl.WSDLException e) {
+                //do nothing
+            }
+        }
     }
 
     public QName getXMLType() {
@@ -66,12 +92,22 @@
                                   XMLStreamReader reader,
                                   DeploymentContext deploymentContext)
         throws XMLStreamException, LoaderException {
-        String uri = reader.getAttributeValue(null, "uri");
-        String portURI = reader.getAttributeValue(null, "port");
-        return createBinding(uri, portURI);
+        // not sure what uri was here ? String uri = reader.getAttributeValue(null, "uri");
+        String uri = null;
+        String endpointAttribute = reader.getAttributeValue(null, "endpoint");
+        //String portURI = reader.getAttributeValue(null, "port");
+        String wsdlLocation = reader.getAttributeValue(null, "location");
+        try {
+            return createBinding(uri, endpointAttribute, wsdlLocation, deploymentContext);
+        } catch (Exception e) {
+
+            throw new LoaderException(e);
+        }
     }
 
-    private WebServiceBinding createBinding(String port, String portURI) {
+    private WebServiceBinding createBinding(String port, String portURI, String wsdlLocation,
+                                            DeploymentContext deploymentContext)
+        throws WSDLException, IOException {
         List<Definition> definitions = null;
         // FIXME wsdlRegistry.getDefinitionsForNamespace(portNamespace,
         // resourceLoader);
@@ -98,10 +134,30 @@
                 portName = fragment;
             }
 
-            // FIXME definitions is always null
-            if (definitions == null) {
-                throw new IllegalArgumentException("Cannot find WSDL definition for " + portNamespace);
+            // FIXME need to find out how to get wsdl and what context to use --- terrible hack attack!
+            // URL wsdlurl = Thread.currentThread().getContextClassLoader().getResource(wsdlLocation);
+            if (null == wsdlLocation) {
+                throw new RuntimeException("Failed to determin wsdl location on binding. "
+                    + "Try specifying 'location' attribute on  binding.");
+            }
+            URL wsdlurl = deploymentContext.getClassLoader().getResource(wsdlLocation);
+            if (wsdlurl == null) {
+                throw new RuntimeException("Failed to load wsdl from '" + wsdlLocation + "'");
             }
+
+            WSDLFactory factory = WSDLFactory.newInstance();
+            WSDLReader reader = factory.newWSDLReader();
+            reader.setFeature("javax.wsdl.verbose", false);
+            InputSource input = new InputSource(wsdlurl.openStream());
+            Definition wsdlDef = reader.readWSDL(wsdlurl.toString(), input);
+            definitions = new LinkedList<Definition>();
+            definitions.add(wsdlDef);
+            // FIXME all the above needs to better addressed.
+
+            //FIXME: if a global wsdl cached is used, we need to do a registration here
+            String namespace = wsdlDef.getTargetNamespace();
+            wsdlRegistry.loadDefinition(namespace, wsdlurl);
+
             Definition definition = null;
             Port thePort = null;
             Service service = null;
@@ -128,7 +184,9 @@
                 throw new IllegalArgumentException("Cannot find WSDL port " + portURI);
 
             }
-            return new WebServiceBinding(definition, thePort, port, portURI, service);
+            WebServiceBinding wsBinding = new WebServiceBinding(definition, thePort, port, portURI, service);
+            wsBinding.setWSDLDefinitionRegistry(wsdlRegistry);
+            return wsBinding;
         }
         // FIXME - return a broken binding for now
         return new WebServiceBinding(null, null, null, portURI, null);

Modified: incubator/tuscany/java/sca/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/io/NodeDataWriter.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/io/NodeDataWriter.java?rev=434106&r1=434105&r2=434106&view=diff
==============================================================================
--- incubator/tuscany/java/sca/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/io/NodeDataWriter.java (original)
+++ incubator/tuscany/java/sca/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/io/NodeDataWriter.java Wed Aug 23 10:58:54 2006
@@ -6,15 +6,15 @@
  * 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.    
+ * under the License.
  */
 package org.apache.tuscany.binding.celtix.io;
 
@@ -50,6 +50,14 @@
     }
 
     public void write(Object obj, QName elName, Node output) {
+        Document doc = output.getOwnerDocument();
+        if (doc == null && output instanceof Document) {
+            doc = (Document)output;
+        }
+
+        Element newEl = doc.createElementNS("anyuri", elName.getLocalPart());
+        output.appendChild(newEl);
+
         /*
         byte bytes[] = SDOXMLHelper.toXMLBytes(
             callback.getTypeHelper(),

Modified: incubator/tuscany/java/sca/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/io/SCADataBindingCallback.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/io/SCADataBindingCallback.java?rev=434106&r1=434105&r2=434106&view=diff
==============================================================================
--- incubator/tuscany/java/sca/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/io/SCADataBindingCallback.java (original)
+++ incubator/tuscany/java/sca/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/io/SCADataBindingCallback.java Wed Aug 23 10:58:54 2006
@@ -6,15 +6,15 @@
  * 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.    
+ * under the License.
  */
 package org.apache.tuscany.binding.celtix.io;
 
@@ -55,8 +55,7 @@
     @SuppressWarnings("unchecked")
     public <T> DataWriter<T> createWriter(Class<T> cls) {
         if (cls == Node.class) {
-            //FIXME
-            //return (DataWriter<T>)new NodeDataWriter(this);
+            return (DataWriter<T>)new NodeDataWriter(this);
         }
         return null;
     }
@@ -64,15 +63,14 @@
     @SuppressWarnings("unchecked")
     public <T> DataReader<T> createReader(Class<T> cls) {
         if (cls == Node.class) {
-            //FIXME
-            //return (DataReader<T>)new NodeDataReader(this);
+            return (DataReader<T>)new NodeDataReader(this);
         }
         //REVISIT - need to figure out what to do with Faults
         return null;
     }
 
     public void initObjectContext(ObjectMessageContext octx) {
-        //REVISIT - is this even used?       
+        //REVISIT - is this even used?
     }
 
 



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org