You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ra...@apache.org on 2009/10/12 11:32:10 UTC
svn commit: r824275 - in
/tuscany/java/sca/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb:
EJBBinding.java impl/EJBBindingImpl.java impl/EJBBindingProcessor.java
Author: ramkumar
Date: Mon Oct 12 09:32:10 2009
New Revision: 824275
URL: http://svn.apache.org/viewvc?rev=824275&view=rev
Log:
Fixes for binding.ejb module for removing the session_type usage
Modified:
tuscany/java/sca/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBinding.java
tuscany/java/sca/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingImpl.java
tuscany/java/sca/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingProcessor.java
Modified: tuscany/java/sca/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBinding.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBinding.java?rev=824275&r1=824274&r2=824275&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBinding.java (original)
+++ tuscany/java/sca/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBinding.java Mon Oct 12 09:32:10 2009
@@ -33,12 +33,10 @@
// 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 @@
EJB2, EJB3
};
- enum SessionType {
- STATEFUL, STATELESS
- };
-
/**
* Gets the homeInterface.
*
@@ -82,9 +76,6 @@
*/
void setEjbLinkName(String ejbLinkName);
- SessionType getSessionType();
- void setSessionType(SessionType sessionType);
-
EJBVersion getEjbVersion();
void setEjbVersion(EJBVersion ejbVersion);
Modified: tuscany/java/sca/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingImpl.java?rev=824275&r1=824274&r2=824275&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingImpl.java (original)
+++ tuscany/java/sca/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingImpl.java Mon Oct 12 09:32:10 2009
@@ -69,7 +69,7 @@
/**
* 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 QName getType() {
- return TYPE;
+ return BINDING_EJB_QNAME;
}
public boolean isUnresolved() {
@@ -162,21 +162,12 @@
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() {
Modified: tuscany/java/sca/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingProcessor.java?rev=824275&r1=824274&r2=824275&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingProcessor.java (original)
+++ tuscany/java/sca/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingProcessor.java Mon Oct 12 09:32:10 2009
@@ -41,19 +41,17 @@
/**
* 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 @@
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")) {