User: vharcq
Date: 02/02/22 16:22:39
Modified: core/src/xdoclet/ejb/tags CmpTagsHandler.java
Log:
Add "cmpspec" attr to <entitycmp/> subtask. This permit for beans to not be aware
of wich cmp implementation will be used for their implementation. And so facilitate
migration cmp1 to cmp2
Revision Changes Path
1.13 +13 -5 xdoclet/core/src/xdoclet/ejb/tags/CmpTagsHandler.java
Index: CmpTagsHandler.java
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/ejb/tags/CmpTagsHandler.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -w -r1.12 -r1.13
--- CmpTagsHandler.java 23 Jan 2002 19:49:22 -0000 1.12
+++ CmpTagsHandler.java 23 Feb 2002 00:22:39 -0000 1.13
@@ -7,6 +7,7 @@
import xdoclet.XDocletException;
import xdoclet.ejb.EntityCmpSubTask;
import xdoclet.ejb.EntityBmpSubTask;
+import xdoclet.ejb.EjbDocletTask;
import xdoclet.tags.MethodTagsHandler;
import xdoclet.util.DocletUtil;
@@ -17,11 +18,10 @@
/**
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 16, 2001
- * @version $Revision: 1.12 $
+ * @version $Revision: 1.13 $
*/
public class CmpTagsHandler extends EntityTagsHandler
{
- public final static String CMP_CERSION_NUMBER_VALID_VALUES = "1.x,2.x";
public static String getEntityCmpClassFor( ClassDoc clazz ) throws
XDocletException
{
@@ -86,14 +86,21 @@
return false;
}
- boolean ejbspec2 = getEjbSpec().equals( "2.0" );
+ boolean ejbspec2 = getEjbSpec().equals(
EjbDocletTask.EjbSpecVersion.EJB_2_0 );
if( ejbspec2 == false )
return false;
- String cmp = getClassTagValue( clazz, "ejb:bean", "cmp-version", -1,
CMP_CERSION_NUMBER_VALID_VALUES, "2.x", true, false );
+ String cmp = getClassTagValue( clazz, "ejb:bean", "cmp-version", -1,
EntityCmpSubTask.CmpSpecVersion.getVersions(), null, true, false );
- return "2.x".equals( cmp );
+ if( cmp == null )
+ {
+ EntityCmpSubTask entitycmp_subtask = ( ( EntityCmpSubTask )
DocletContext.getInstance().getSubTaskBy( EntityCmpSubTask.SUBTASK_NAME ) );
+
+ cmp = entitycmp_subtask.getCmpSpec();
+ }
+
+ return EntityCmpSubTask.CmpSpecVersion.CMP_2_0.equals( cmp );
}
protected static String getEntityCmpClassPattern()
@@ -234,4 +241,5 @@
setCurrentClass( oldClass );
}
}
+
}
_______________________________________________
Xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
