From: Alexey L. <lou...@us...> - 2002-10-18 20:37:30
|
User: loubyansky Date: 02/10/18 13:37:29 Modified: src/main/org/jboss/test/foedeployer/ejb/m2mb DeveloperBean.java M2MBManagerBean.java ProjectBean.java Log: updated beans with new XDoclet notations Revision Changes Path 1.2 +55 -71 jbosstest/src/main/org/jboss/test/foedeployer/ejb/m2mb/DeveloperBean.java Index: DeveloperBean.java =================================================================== RCS file: /cvsroot/jboss/jbosstest/src/main/org/jboss/test/foedeployer/ejb/m2mb/DeveloperBean.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- DeveloperBean.java 19 Jul 2002 18:31:50 -0000 1.1 +++ DeveloperBean.java 18 Oct 2002 20:37:29 -0000 1.2 @@ -6,7 +6,6 @@ */ package org.jboss.test.foedeployer.ejb.m2mb; - import javax.ejb.EntityBean; import javax.ejb.EntityContext; import javax.ejb.FinderException; @@ -30,106 +29,95 @@ import org.apache.log4j.Category; - /** * Models a developer. * - * @ejb:bean name="Developer" - * generate="true" - * view-type="local" - * type="CMP" - * local-jndi-name="DeveloperEJB.DeveloperHome" - * reentrant="False" - * cmp-version="2.x" - * primkey-field="name" - * - * @ejb:pk class="java.lang.String" - * generate="false" + * @ejb.bean + * name="Developer" + * generate="true" + * view-type="local" + * type="CMP" + * local-jndi-name="DeveloperEJB.DeveloperHome" + * reentrant="False" + * cmp-version="2.x" + * primkey-field="name" + * + * @ejb.pk + * class="java.lang.String" + * generate="false" + * + * @ejb.transaction type="Required" * - * @ejb:transaction type="Required" + * @@ejb:finder signature="Collection findAll()" * - * @eejb:finder signature="Collection findAll()" + * @ejbpersistence table-name="developer" * - * @jboss:table-name developers + * @jboss.create-table "${jboss.create.table}" + * @jboss.remove-table "${jboss.remove.table}" * - * @weblogic:table-name developers - * - * @jboss:create-table "${jboss.create.table}" - * @jboss:remove-table "${jboss.remove.table}" - * - * @author <a href="mailto:lou...@ua...">Alex Loubyansky</a> + * @author <a href="mailto:lou...@ho...">Alex Loubyansky</a> */ public abstract class DeveloperBean implements EntityBean { - // Constants ----------------------------------------------------- + static Category log = Category.getInstance( DeveloperBean.class ); - static Category log = Category.getInstance(DeveloperBean.class.getName()); - - // Attributes ---------------------------------------------------- - - private EntityContext mContext; + private EntityContext ctx; - - // CMP Accessors ------------------------------------------------- + // CMP /** * Developer's name: primary key field * - * @ejb:pk-field - * @ejb:persistent-field - * @ejb:interface-method - * - * @jboss:column-name name - * @jboss:jdbc-type type="VARCHAR" - * @jboss:sql-type type="VARCHAR(50)" - * - * @weblogic:dbms-column name + * @ejb.pk-field + * @ejb.persistent-field + * @ejb.interface-method + * + * @ejb.persistence + * column-name name + * jdbc-type="VARCHAR" + * sql-type="VARCHAR(50)" */ public abstract String getName(); public abstract void setName(String name); - // CMR Accessors --------------------- + // CMR /** * Projects: m2m bidirectional CMR * - * @ejb:interface-method - * - * @ejb:relation name="Developer-Project" - * role-name="Developer-Has-Projects" + * @ejb.interface-method * - * @jboss:relation-table table-name="developer_project" - * create-table="${jboss.create.table}" - * remove-table="${jboss.remove.table}" - * - * @jboss:relation fk-contraint="false" - * related-pk-field="name" - * fk-column="project" - * - * @weblogic:relation join-table-name="developer_project" - * - * @weblogic:column-map foreign-key-column="project" - * key-column="name" + * @ejb.relation + * name="Developer-Project" + * role-name="Developer-Has-Projects" + * + * @jboss.relation-table + * table-name="developer_project" + * create-table="${jboss.create.table}" + * remove-table="${jboss.remove.table}" + * @jboss.relation + * fk-contraint="false" + * related-pk-field="name" + * fk-column="project" + * + * @weblogic.relation join-table-name="developer_project" + * @weblogic.column-map + * foreign-key-column="project" + * key-column="name" */ public abstract Collection getProjects(); - /** - * @ejb:interface-method + * @ejb.interface-method */ public abstract void setProjects(Collection projects); - - // Home methods ---------------------------------------------- - - // EntityBean Implementation ------------------------------------- - /** - * @ejb:create-method + * @ejb.create-method */ public String ejbCreate( String name ) throws CreateException @@ -140,24 +128,20 @@ public void ejbPostCreate( String name ) { } - - /** - * @ejb:interface-method - */ public void ejbRemove() throws RemoveException { - log.debug("removed: " + mContext.getPrimaryKey() ); + log.debug("removed: " + ctx.getPrimaryKey() ); } public void setEntityContext(EntityContext ctx) { - mContext = ctx; + this.ctx = ctx; } public void unsetEntityContext() { - mContext = null; + ctx = null; } public void ejbActivate() { } 1.2 +22 -30 jbosstest/src/main/org/jboss/test/foedeployer/ejb/m2mb/M2MBManagerBean.java Index: M2MBManagerBean.java =================================================================== RCS file: /cvsroot/jboss/jbosstest/src/main/org/jboss/test/foedeployer/ejb/m2mb/M2MBManagerBean.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- M2MBManagerBean.java 19 Jul 2002 18:31:50 -0000 1.1 +++ M2MBManagerBean.java 18 Oct 2002 20:37:29 -0000 1.2 @@ -6,7 +6,6 @@ */ package org.jboss.test.foedeployer.ejb.m2mb; - import java.sql.Date; import java.util.Collection; import java.util.HashSet; @@ -31,43 +30,42 @@ import org.apache.log4j.Category; - /** * Manager session bean. * - * @ejb:bean type="Stateless" - * name="M2MBManager" - * jndi-name="M2MBManagerEJB.M2MBManagerHome" - * generate="true" + * @ejb.bean + * type="Stateless" + * name="M2MBManager" + * jndi-name="M2MBManagerEJB.M2MBManagerHome" + * generate="true" + * view-type="remote" * - * @ejb:ejb-ref ejb-name="Project" view-type="local" - * @ejb:ejb-ref ejb-name="Developer" view-type="local" + * @ejb.ejb-ref + * ejb-name="Project" + * view-type="local" + * @ejb.ejb-ref + * ejb-name="Developer" + * view-type="local" * - * @ejb:transaction type="Required" + * @ejb.transaction type="Required" */ public class M2MBManagerBean implements SessionBean { - // Attributes -------------------------------------------------- - - static Category log = Category.getInstance(M2MBManagerBean.class.getName()); + static Category log = Category.getInstance( M2MBManagerBean.class ); static String PROJECT_NAME = "java:comp/env/ejb/Project"; static String DEVELOPER_NAME = "java:comp/env/ejb/Developer"; - private SessionContext ctx; - private ProjectLocalHome projectHome; private DeveloperLocalHome developerHome; - // Business methods --------------------------------------------- - /** * Creates a project * - * @ejb:interface-method + * @ejb.interface-method */ public void createProject( String projectName ) { @@ -84,7 +82,7 @@ /** * Creates a developer * - * @ejb:interface-method + * @ejb.interface-method */ public void createDeveloper( String developerName ) { @@ -101,7 +99,7 @@ /** * Returns developers for project * - * @ejb:interface-method + * @ejb.interface-method */ public Collection getDevelopersForProject( String projectName ) { @@ -125,7 +123,7 @@ /** * Returns projects for developer * - * @ejb:interface-method + * @ejb.interface-method */ public Collection getProjectsForDeveloper( String developerName ) { @@ -150,7 +148,7 @@ /** * Adds a project to developer * - * @ejb:interface-method + * @ejb.interface-method */ public void addProjectToDeveloper( String developerName, String projectName ) @@ -170,7 +168,7 @@ /** * Adds a develeloper to project * - * @ejb:interface-method + * @ejb.interface-method */ public void addDeveloperToProject( String projectName, String developerName ) @@ -190,7 +188,7 @@ /** * Removes project if exists * - * @ejb:interface-method + * @ejb.interface-method */ public void removeProjectIfExists( String projectName ) { @@ -208,7 +206,7 @@ /** * Removes developer if exists * - * @ejb:interface-method + * @ejb.interface-method */ public void removeDeveloperIfExists( String developerName ) { @@ -228,12 +226,9 @@ public void setSessionContext(SessionContext c) { - ctx = c; - try { Context ic = new InitialContext(); - developerHome = (DeveloperLocalHome)ic.lookup(DEVELOPER_NAME); projectHome = (ProjectLocalHome)ic.lookup(PROJECT_NAME); } @@ -249,10 +244,7 @@ * @ejb:create-method */ public void ejbCreate() { } - public void ejbActivate() { } - public void ejbPassivate() { } - public void ejbRemove() { } } 1.2 +56 -74 jbosstest/src/main/org/jboss/test/foedeployer/ejb/m2mb/ProjectBean.java Index: ProjectBean.java =================================================================== RCS file: /cvsroot/jboss/jbosstest/src/main/org/jboss/test/foedeployer/ejb/m2mb/ProjectBean.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ProjectBean.java 19 Jul 2002 18:31:50 -0000 1.1 +++ ProjectBean.java 18 Oct 2002 20:37:29 -0000 1.2 @@ -6,7 +6,6 @@ */ package org.jboss.test.foedeployer.ejb.m2mb; - import javax.ejb.EntityBean; import javax.ejb.EntityContext; import javax.ejb.FinderException; @@ -30,107 +29,94 @@ import org.apache.log4j.Category; - /** * Models a project. * - * @ejb:bean name="Project" - * generate="true" - * view-type="local" - * type="CMP" - * local-jndi-name="ProjectEJB.ProjectHome" - * reentrant="False" - * cmp-version="2.x" - * primkey-field="name" - * - * @ejb:pk class="java.lang.String" - * generate="false" - * - * @eejb:finder signature="Collection findAll()" + * @ejb.bean + * name="Project" + * generate="true" + * view-type="local" + * type="CMP" + * local-jndi-name="ProjectEJB.ProjectHome" + * reentrant="False" + * cmp-version="2.x" + * primkey-field="name" + * + * @ejb.pk + * class="java.lang.String" + * generate="false" + * + * @@ejb.finder signature="Collection findAll()" * - * @ejb:transaction type="Required" + * @ejb.transaction type="Required" * - * @jboss:table-name projects + * @ejb.persistence table-name="project" * - * @weblogic:table-name projects + * @jboss.create-table "${jboss.create.table}" + * @jboss.remove-table "${jboss.remove.table}" * - * @jboss:create-table "${jboss.create.table}" - * @jboss:remove-table "${jboss.remove.table}" - * - * @author <a href="mailto:lou...@ua...">Alex Loubyansky</a> + * @author <a href="mailto:alo...@ho...">Alex Loubyansky</a> */ public abstract class ProjectBean implements EntityBean { + // Constants ----------------------------------------------------- + static Category log = Category.getInstance( ProjectBean.class ); - // Constants ----------------------------------------------------- - - static Category log = Category.getInstance(ProjectBean.class.getName()); - - // Attributes ---------------------------------------------------- - - private EntityContext mContext; + private EntityContext ctx; - - // Persistent Attribute Accessors -------------------------------- + // CMP /** * Project name: primary key field * - * @ejb:pk-field - * @ejb:persistent-field - * @ejb:interface-method - * - * @jboss:column-name name - * @jboss:jdbc-type type="VARCHAR" - * @jboss:sql-type type="VARCHAR(50)" - * - * @weblogic:dbms-column name + * @ejb.pk-field + * @ejb.persistent-field + * @ejb.interface-method + * + * @ejb.persistence + * column-name="name" + * jdbc-type="VARCHAR" + * sql-type="VARCHAR(50)" */ public abstract String getName(); public abstract void setName(String name); - - // CMR Accessors --------------------- + // CMR /** * Developers: m2m bidirectional CMR * - * @ejb:interface-method - * - * @ejb:relation name="Developer-Project" - * role-name="Project-Has-Developers" + * @ejb.interface-method * - * @jboss:relation-table table-name="developer_project" - * create-table="${jboss.create.table}" - * remove-table="${jboss.remove.table}" - * - * @jboss:relation fk-contraint="false" - * related-pk-field="name" - * fk-column="developer" - * - * @weblogic:relation join-table-name="developer_project" - * - * @weblogic:column-map foreign-key-column="developer" - * key-column="name" + * @ejb.relation + * name="Developer-Project" + * role-name="Project-Has-Developers" + * + * @jboss.relation-table + * table-name="developer_project" + * create-table="${jboss.create.table}" + * remove-table="${jboss.remove.table}" + * @jboss.relation + * fk-contraint="false" + * related-pk-field="name" + * fk-column="developer" + * + * @weblogic.relation join-table-name="developer_project" + * @weblogic.column-map + * foreign-key-column="developer" + * key-column="name" */ public abstract Collection getDevelopers(); - /** - * @ejb:interface-method + * @ejb.interface-method */ public abstract void setDevelopers(Collection developer); - - - // Home methods ---------------------------------------------- - - // EntityBean Implementation ------------------------------------- - /** - * @ejb:create-method + * @ejb.create-method */ public String ejbCreate( String name ) throws CreateException @@ -141,24 +127,20 @@ public void ejbPostCreate( String name ) { } - - /** - * @ejb:interface-method - */ public void ejbRemove() throws RemoveException { - log.debug("removed: " + mContext.getPrimaryKey() ); + log.debug("removed: " + ctx.getPrimaryKey() ); } public void setEntityContext(EntityContext ctx) { - mContext = ctx; + this.ctx = ctx; } public void unsetEntityContext() { - mContext = null; + ctx = null; } public void ejbActivate() { } |