diff options
Diffstat (limited to 'java/sca/modules/binding-ejb/src/main')
3 files changed, 12 insertions, 43 deletions
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 afcd63e855..cfaaeb284c 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 @@ -33,12 +33,10 @@ public interface EJBBinding extends Binding, Base { // model and for setting up defaults String BINDING_EJB = "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"; - String SESSION_TYPE = "session-type"; String EJB_VERSION = "ejb-version"; String NAME = "name"; String POLICY_SETS = "policySets"; @@ -50,10 +48,6 @@ public interface EJBBinding extends Binding, Base { EJB2, EJB3 }; - enum SessionType { - STATEFUL, STATELESS - }; - /** * Gets the homeInterface. * @@ -82,9 +76,6 @@ public interface EJBBinding extends Binding, Base { */ void setEjbLinkName(String ejbLinkName); - SessionType getSessionType(); - void setSessionType(SessionType sessionType); - EJBVersion getEjbVersion(); void setEjbVersion(EJBVersion ejbVersion); 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 1207e9ecd9..c4a51f93a3 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 @@ -69,7 +69,7 @@ public class EJBBindingImpl implements EJBBinding { /** * The type of session for this EJB Binding */ - private SessionType sessionType; + //private SessionType sessionType; /** * The EJB version for this EJB Binding @@ -151,7 +151,7 @@ public class EJBBindingImpl implements EJBBinding { } public QName getType() { - return TYPE; + return BINDING_EJB_QNAME; } public boolean isUnresolved() { @@ -162,21 +162,12 @@ public class EJBBindingImpl implements EJBBinding { this.unresolved = unresolved; } - public void setSessionType(SessionType ejb_version_enum) { - this.sessionType = ejb_version_enum; - } - public void setEjbVersion(EJBVersion ejb_version_enum) { this.ejbVersion = ejb_version_enum; } public void setRequires(String requires) { this.requires = requires; - - } - - public SessionType getSessionType() { - return sessionType; } public EJBVersion getEjbVersion() { 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 6506114750..1c678a05d1 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 @@ -41,19 +41,17 @@ import org.apache.tuscany.sca.policy.PolicyFactory; /** * A processor to read the XML that describes the EJB binding... * - * <binding.ejb - * homeInterface="NCName"? - * ejb-link-name="NCName"? - * session-type="stateful or stateless"? - * ejb-version="EJB2 or EJB3"? - * name="NCName"? - * policySets=" sca:listOfQNames"? - * requires="sca:listOfQNames"? - * uri="anyURI"? - * > + * <binding.ejb homeInterface="NCName"? + * ejb-link-name="string"? + * ejb-version="EJB2 or EJB3"? + * name="NCName"? + * policySets="sca:listOfQNames"? + * requires="sca:listOfQNames"? + * uri="anyURI"?> + * <wireFormat ... />? + * <operationSelector ... />? * - * <!-- additional elements here --> - * + * <!-- additional elements here --> * * </binding.ejb> * * @version $Rev$ $Date$ @@ -123,17 +121,6 @@ public class EJBBindingProcessor implements StAXArtifactProcessor<EJBBinding> { ejbBinding.setEjbLinkName(ejbLinkName); } - String sessionType = reader.getAttributeValue(null, EJBBinding.SESSION_TYPE); - if (sessionType != null) { - if (sessionType.equals("stateless")) { - ejbBinding.setSessionType(EJBBinding.SessionType.STATELESS); - } else if (sessionType.equals("stateful")) { - ejbBinding.setSessionType(EJBBinding.SessionType.STATEFUL); - } else { - error("UnknownEJBSessionType", reader, sessionType, name); - } - } - String ejbVersion = reader.getAttributeValue(null, EJBBinding.EJB_VERSION); if (ejbVersion != null) { if (ejbVersion.equals("EJB2")) { |