1 files changed, 49 insertions, 42 deletions

diff --git a/branches/sca-java-1.x/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/xml/HTTPBindingProcessor.java b/branches/sca-java-1.x/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/xml/HTTPBindingProcessor.java
index 1d872d6a51..8d1c761d9c 100644
--- a/branches/sca-java-1.x/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/xml/HTTPBindingProcessor.java
+++ b/branches/sca-java-1.x/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/xml/HTTPBindingProcessor.java
@@ -1,24 +1,24 @@
-/*

- * 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.    

- */

-

-package org.apache.tuscany.sca.binding.http.xml;

-

+/*
+ * 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.    
+ */
+
+package org.apache.tuscany.sca.binding.http.xml;
+
 import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;

 import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;

 

@@ -122,33 +122,40 @@ public class HTTPBindingProcessor extends BaseStAXArtifactProcessor implements S
         }

 

         return httpBinding;

-    }

-

+    }
+
     public void write(HTTPBinding httpBinding, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {

         //writer.writeStartElement(Constants.SCA10_NS, BINDING_HTTP);

         

         writeStart(writer, BINDING_HTTP_QNAME.getNamespaceURI(), BINDING_HTTP_QNAME.getLocalPart());

         

-        // Write binding name

+        // Write binding name
         if (httpBinding.getName() != null) {

-            writer.writeAttribute(NAME, httpBinding.getName());

-        }

-

-        // Write binding URI

-        if (httpBinding.getURI() != null) {

-            writer.writeAttribute(URI, httpBinding.getURI());

-        }

-        

-        writeEnd(writer);

-        //writer.writeEndElement();

-    }

-

-

+            writer.writeAttribute(NAME, httpBinding.getName());
+        }
+
+        // Write binding URI
+        if (httpBinding.getURI() != null) {
+            writer.writeAttribute(URI, httpBinding.getURI());
+        }
+        
+        if ( httpBinding.getRequestWireFormat() != null ) {
+        	extensionProcessor.write(httpBinding.getRequestWireFormat(), writer);
+        }
+        
+        if ( httpBinding.getOperationSelector() != null ) {
+        	extensionProcessor.write(httpBinding.getOperationSelector(), writer);
+        }
+        writeEnd(writer);
+        //writer.writeEndElement();
+    }
+
+
     public void resolve(HTTPBinding model, ModelResolver resolver) throws ContributionResolveException {

         // Should not need to do anything here for now... 

         

-    }

-    

+    }
+    
     /**

      * Report a error.

      * 

@@ -161,6 +168,6 @@ public class HTTPBindingProcessor extends BaseStAXArtifactProcessor implements S
                 Problem problem = new ProblemImpl(this.getClass().getName(), "binding-http-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);

                 monitor.problem(problem);

          }

-    }

-

-}

+    }
+
+}