5 files changed, 13 insertions, 11 deletions
diff --git a/java/sca/modules/binding-ejb/META-INF/MANIFEST.MF b/java/sca/modules/binding-ejb/META-INF/MANIFEST.MF
index 9ef12193a9..a8bd2b925f 100644
--- a/java/sca/modules/binding-ejb/META-INF/MANIFEST.MF
+++ b/java/sca/modules/binding-ejb/META-INF/MANIFEST.MF
@@ -24,5 +24,5 @@ Import-Package: javax.xml.namespace,
  org.apache.tuscany.sca.policy;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.binding.ejb
 Bundle-DocURL: http://www.apache.org/
-
-Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
+
diff --git a/java/sca/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBinding.java b/java/sca/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBinding.java
index c6243266d6..afcd63e855 100644
--- a/java/sca/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBinding.java
+++ b/java/sca/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBinding.java
@@ -22,7 +22,6 @@ import javax.xml.namespace.QName;
 
 import org.apache.tuscany.sca.assembly.Base;
 import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.xml.Constants;
 
 /**
  * An implementation of EJBBinding.
@@ -33,8 +32,9 @@ public interface EJBBinding extends Binding, Base {
     // Constants used when describing the EJB binding
     // model and for setting up defaults
     String BINDING_EJB = "binding.ejb";
-    QName BINDING_EJB_QNAME = new QName(Constants.SCA11_NS, BINDING_EJB);
-
+    QName BINDING_EJB_QNAME = new QName(SCA11_NS, BINDING_EJB);
+    QName TYPE = new QName(SCA11_NS, BINDING_EJB);
+    
     // Constants for the XML describing the EJB Binding
     String HOME_INTERFACE = "homeInterface";
     String EJB_LINK_NAME = "ejb-link-name";
diff --git a/java/sca/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingImpl.java b/java/sca/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingImpl.java
index 4abed80aa3..1207e9ecd9 100644
--- a/java/sca/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingImpl.java
+++ b/java/sca/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingImpl.java
@@ -18,6 +18,8 @@
  */
 package org.apache.tuscany.sca.binding.ejb.impl;
 
+import javax.xml.namespace.QName;
+
 import org.apache.tuscany.sca.binding.ejb.EJBBinding;
 
 /**
@@ -147,6 +149,10 @@ public class EJBBindingImpl implements EJBBinding {
     public void setURI(String uri) {
         this.uri = uri;
     }
+    
+    public QName getType() {
+        return TYPE;
+    }
 
     public boolean isUnresolved() {
         return this.unresolved;
diff --git a/java/sca/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingProcessor.java b/java/sca/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingProcessor.java
index 49607e8716..6506114750 100644
--- a/java/sca/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingProcessor.java
+++ b/java/sca/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingProcessor.java
@@ -131,7 +131,6 @@ public class EJBBindingProcessor implements StAXArtifactProcessor<EJBBinding> {
                 ejbBinding.setSessionType(EJBBinding.SessionType.STATEFUL);
             } else {
             	error("UnknownEJBSessionType", reader, sessionType, name);            	
-                //throw new ContributionReadException("Unknown EJB Session Type of " + sessionType + " for " + name);
             }
         }
 
@@ -143,7 +142,6 @@ public class EJBBindingProcessor implements StAXArtifactProcessor<EJBBinding> {
                 ejbBinding.setEjbVersion(EJBBinding.EJBVersion.EJB3);
             } else {
             	error("UnknownEJBVersion", reader, ejbVersion, name);
-                //throw new ContributionReadException("Unknown EJB Version of " + ejbVersion + " for " + name);
             }
         }
 
@@ -167,11 +165,9 @@ public class EJBBindingProcessor implements StAXArtifactProcessor<EJBBinding> {
         
         if (ejbBinding.getURI() != null){
             writer.writeAttribute(EJBBinding.URI, ejbBinding.getURI());
-        }        
-        
+        }
         
         // FIXME Implement the rest
-
         writer.writeEndElement();
     }
 
diff --git a/java/sca/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 82e85ef067..1e45ca9f79 100644
--- a/java/sca/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/java/sca/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
@@ -16,4 +16,4 @@
 # under the License. 
 
 # Implementation class for the artifact processor extension
-org.apache.tuscany.sca.binding.ejb.impl.EJBBindingProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#binding.ejb,model=org.apache.tuscany.sca.binding.ejb.EJBBinding
+org.apache.tuscany.sca.binding.ejb.impl.EJBBindingProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#binding.ejb,model=org.apache.tuscany.sca.binding.ejb.EJBBinding