[jboss-cvs] JBossAS SVN: r66349 - projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Oct 23 02:24:29 EDT 2007
Author: scott.stark at jboss.org
Date: 2007-10-23 02:24:29 -0400 (Tue, 23 Oct 2007)
New Revision: 66349
Modified:
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java
Log:
Support all spec session metadata and implement merge
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java 2007-10-23 06:07:40 UTC (rev 66348)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java 2007-10-23 06:24:29 UTC (rev 66349)
@@ -21,10 +21,20 @@
*/
package org.jboss.metadata.ejb.jboss;
-import org.jboss.metadata.common.javaee.ejb.IEnterpriseBeanMetaData;
+import org.jboss.metadata.ejb.spec.AroundInvokesMetaData;
+import org.jboss.metadata.ejb.spec.BusinessLocalsMetaData;
+import org.jboss.metadata.ejb.spec.BusinessRemotesMetaData;
+import org.jboss.metadata.ejb.spec.EnterpriseBeanMetaData;
+import org.jboss.metadata.ejb.spec.InitMethodsMetaData;
+import org.jboss.metadata.ejb.spec.NamedMethodMetaData;
+import org.jboss.metadata.ejb.spec.RemoveMethodsMetaData;
import org.jboss.metadata.ejb.spec.SecurityIdentityMetaData;
import org.jboss.metadata.ejb.spec.SessionBeanMetaData;
+import org.jboss.metadata.ejb.spec.SessionType;
+import org.jboss.metadata.ejb.spec.TransactionType;
+import org.jboss.metadata.javaee.spec.LifecycleCallbacksMetaData;
import org.jboss.metadata.javaee.spec.PortComponent;
+import org.jboss.metadata.javaee.spec.SecurityRoleRefsMetaData;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
@@ -33,14 +43,63 @@
* SessionBeanMetaData.
*
* @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision: 1.1 $
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
*/
@XmlType(name="jboss-session-beanType")
public class JBossSessionBeanMetaData extends JBossEnterpriseBeanMetaData
{
/** The serialVersionUID */
private static final long serialVersionUID = 720735017632869718L;
+
+ /** The home interface */
+ private String home;
+
+ /** The remote interface */
+ private String remote;
+
+ /** The local home */
+ private String localHome;
+
+ /** The local */
+ private String local;
+ /** The business locals */
+ private BusinessLocalsMetaData businessLocals;
+
+ /** The business remotes */
+ private BusinessRemotesMetaData businessRemotes;
+
+ /** The service endpoint */
+ private String serviceEndpoint;
+
+ /** The sesion type */
+ private SessionType sessionType;
+
+ /** The timeout method */
+ private NamedMethodMetaData timeoutMethod;
+
+ /** The init methods */
+ private InitMethodsMetaData initMethods;
+
+ /** The remove methods */
+ private RemoveMethodsMetaData removeMethods;
+
+ /** The transaction type */
+ private TransactionType transactionType;
+
+ /** The around invoke */
+ private AroundInvokesMetaData aroundInvokes;
+
+ /** The post activates */
+ private LifecycleCallbacksMetaData postActivates;
+
+ /** The pre passivates */
+ private LifecycleCallbacksMetaData prePassivates;
+
+ /** The security role ref */
+ private SecurityRoleRefsMetaData securityRoleRefs;
+
/** The jndi name */
private String jndiName;
@@ -96,6 +155,86 @@
return true;
}
+ public AroundInvokesMetaData getAroundInvokes()
+ {
+ return aroundInvokes;
+ }
+
+ public BusinessLocalsMetaData getBusinessLocals()
+ {
+ return businessLocals;
+ }
+
+ public BusinessRemotesMetaData getBusinessRemotes()
+ {
+ return businessRemotes;
+ }
+
+ public String getHome()
+ {
+ return home;
+ }
+
+ public InitMethodsMetaData getInitMethods()
+ {
+ return initMethods;
+ }
+
+ public String getLocal()
+ {
+ return local;
+ }
+
+ public String getLocalHome()
+ {
+ return localHome;
+ }
+
+ public LifecycleCallbacksMetaData getPostActivates()
+ {
+ return postActivates;
+ }
+
+ public LifecycleCallbacksMetaData getPrePassivates()
+ {
+ return prePassivates;
+ }
+
+ public String getRemote()
+ {
+ return remote;
+ }
+
+ public RemoveMethodsMetaData getRemoveMethods()
+ {
+ return removeMethods;
+ }
+
+ public SecurityRoleRefsMetaData getSecurityRoleRefs()
+ {
+ return securityRoleRefs;
+ }
+
+ public String getServiceEndpoint()
+ {
+ return serviceEndpoint;
+ }
+
+ public SessionType getSessionType()
+ {
+ return sessionType;
+ }
+
+ public NamedMethodMetaData getTimeoutMethod()
+ {
+ return timeoutMethod;
+ }
+
+ public TransactionType getTransactionType()
+ {
+ return transactionType;
+ }
+
@Override
public String getDefaultConfigurationName()
{
@@ -365,4 +504,121 @@
this.remoteBinding = remoteBinding;
}
+ @Override
+ public void merge(JBossEnterpriseBeanMetaData override, EnterpriseBeanMetaData original)
+ {
+ super.merge(override, original);
+ JBossSessionBeanMetaData joverride = (JBossSessionBeanMetaData) override;
+ SessionBeanMetaData soriginal = (SessionBeanMetaData) original;
+
+ // home
+ if(joverride != null && joverride.home != null)
+ home = joverride.home;
+ else if(soriginal != null && soriginal.getHome() != null)
+ home = soriginal.getHome();
+ // remote
+ if(joverride != null && joverride.remote != null)
+ remote = joverride.remote;
+ else if(soriginal != null && soriginal.getRemote() != null)
+ remote = soriginal.getRemote();
+ // localHome
+ if(joverride != null && joverride.localHome != null)
+ localHome = joverride.localHome;
+ else if(soriginal != null && soriginal.getLocalHome() != null)
+ localHome = soriginal.getLocalHome();
+ // local
+ if(joverride != null && joverride.local != null)
+ local = joverride.local;
+ else if(soriginal != null && soriginal.getLocal() != null)
+ local = soriginal.getLocal();
+ // businessLocals
+ if(joverride != null && joverride.businessLocals != null)
+ businessLocals = joverride.businessLocals;
+ else if(soriginal != null && soriginal.getBusinessLocals() != null)
+ businessLocals = soriginal.getBusinessLocals();
+ // businessRemotes
+ if(joverride != null && joverride.businessRemotes != null)
+ businessRemotes = joverride.businessRemotes;
+ else if(soriginal != null && soriginal.getBusinessRemotes() != null)
+ businessRemotes = soriginal.getBusinessRemotes();
+ // serviceEndpoint
+ if(joverride != null && joverride.serviceEndpoint != null)
+ serviceEndpoint = joverride.serviceEndpoint;
+ else if(soriginal != null && soriginal.getServiceEndpoint() != null)
+ serviceEndpoint = soriginal.getServiceEndpoint();
+ // sessionType
+ if(joverride != null && joverride.sessionType != null)
+ sessionType = joverride.sessionType;
+ else if(soriginal != null && soriginal.getSessionType() != null)
+ sessionType = soriginal.getSessionType();
+ // sessionType
+ if(joverride != null && joverride.sessionType != null)
+ sessionType = joverride.sessionType;
+ else if(soriginal != null && soriginal.getSessionType() != null)
+ sessionType = soriginal.getSessionType();
+ // timeoutMethod
+ if(joverride != null && joverride.timeoutMethod != null)
+ timeoutMethod = joverride.timeoutMethod;
+ else if(soriginal != null && soriginal.getTimeoutMethod() != null)
+ timeoutMethod = soriginal.getTimeoutMethod();
+ // initMethods
+ if(joverride != null && joverride.initMethods != null)
+ initMethods = joverride.initMethods;
+ else if(soriginal != null && soriginal.getInitMethods() != null)
+ initMethods = soriginal.getInitMethods();
+ // removeMethods
+ if(joverride != null && joverride.removeMethods != null)
+ removeMethods = joverride.removeMethods;
+ else if(soriginal != null && soriginal.getRemoveMethods() != null)
+ removeMethods = soriginal.getRemoveMethods();
+ // transactionType
+ if(joverride != null && joverride.transactionType != null)
+ transactionType = joverride.transactionType;
+ else if(soriginal != null && soriginal.getTransactionType() != null)
+ transactionType = soriginal.getTransactionType();
+ // aroundInvokes
+ if(joverride != null && joverride.aroundInvokes != null)
+ aroundInvokes = joverride.aroundInvokes;
+ else if(soriginal != null && soriginal.getAroundInvokes() != null)
+ aroundInvokes = soriginal.getAroundInvokes();
+ // postActivates
+ if(joverride != null && joverride.postActivates != null)
+ postActivates = joverride.postActivates;
+ else if(soriginal != null && soriginal.getPostActivates() != null)
+ postActivates = soriginal.getPostActivates();
+ // prePassivates
+ if(joverride != null && joverride.prePassivates != null)
+ prePassivates = joverride.prePassivates;
+ else if(soriginal != null && soriginal.getPrePassivates() != null)
+ prePassivates = soriginal.getPrePassivates();
+ // securityRoleRefs
+ if(joverride != null && joverride.securityRoleRefs != null)
+ securityRoleRefs = joverride.securityRoleRefs;
+ else if(soriginal != null && soriginal.getSecurityRoleRefs() != null)
+ securityRoleRefs = soriginal.getSecurityRoleRefs();
+
+ // jndiName
+ if(joverride != null && joverride.jndiName != null)
+ jndiName = joverride.jndiName;
+ else if(soriginal != null && soriginal.getMappedName() != null)
+ jndiName = soriginal.getMappedName();
+ // callByValue
+ if(joverride != null)
+ callByValue = joverride.callByValue;
+ // clustered
+ if(joverride != null)
+ clustered = joverride.clustered;
+ // remoteBinding
+ if(joverride != null && joverride.remoteBinding != null)
+ remoteBinding = joverride.remoteBinding;
+ // clusterConfig
+ if(joverride != null && joverride.clusterConfig != null)
+ clusterConfig = joverride.clusterConfig;
+ // portComponent
+ if(joverride != null && joverride.portComponent != null)
+ portComponent = joverride.portComponent;
+ // ejbTimeoutIdentity
+ if(joverride != null && joverride.ejbTimeoutIdentity != null)
+ ejbTimeoutIdentity = joverride.ejbTimeoutIdentity;
+ }
}
Property changes on: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
More information about the jboss-cvs-commits
mailing list