The patch below tidies a few more persistent/persistence-type 
parameter bits up (since it's now just determined by @ejb:bean 
type="BMP,CMP") and fixes a dodgy exception message.


Andrew.

Index: core/src/xdoclet/ejb/AbstractEjbSubTask.java
===================================================================
RCS file: 
/cvsroot/xdoclet/xdoclet/core/src/xdoclet/ejb/AbstractEjbSubTask.java,v
retrieving revision 1.24
diff -r1.24 AbstractEjbSubTask.java
1490c1490
<               String value = getParameterValue( DocletUtil.getText( 
getCurrentClass(), "ejb:bean" ), "persistent", -1 );
---
>               String value = getParameterValue( DocletUtil.getText( 
getCurrentClass(), "ejb:bean" ), "type", -1 );
1509c1509
<               String value = getParameterValue( DocletUtil.getText( 
getCurrentClass(), "ejb:bean" ), "persistent", -1 );
---
>               String value = getParameterValue( DocletUtil.getText( 
getCurrentClass(), "ejb:bean" ), "type", -1 );
1933c1933
<               throw new IllegalStateException( "Could find bean " + 
fullClassName()
---
>               throw new IllegalStateException( "Couldn't find bean " + 
fullClassName()
Index: core/resources/xdoclet/ejb/ejb-body.j
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/resources/xdoclet/ejb/ejb-body.j,v
retrieving revision 1.14
diff -r1.14 ejb-body.j
79c79,84
<          <persistence-type><XDoclet:classTagValue tagName="ejb:bean" 
paramName="persistence-type" values="Container,Bean" 
default="Container"/></persistence-type>
---
>        <XDoclet:ifClassTagValueEquals tagName="ejb:bean" 
paramName="type" value="CMP">
>          <persistence-type>Container</persistence-type>
>        </XDoclet:ifClassTagValueEquals>
>        <XDoclet:ifClassTagValueEquals tagName="ejb:bean" 
paramName="type" value="BMP">
>          <persistence-type>Bean</persistence-type>
>        </XDoclet:ifClassTagValueEquals>
84c89
<        <XDoclet:ifClassTagValueEquals tagName="ejb:bean" 
paramName="persistent" value="CMP">
---
>        <XDoclet:ifClassTagValueEquals tagName="ejb:bean" 
paramName="type" value="CMP">
258,259c263,264
<     <XDoclet:ifHasClassTag tagName="ejb:bean" paramName="persistent">
<      <XDoclet:ifClassTagValueEquals tagName="ejb:bean" 
paramName="persistent" value="CMP">
---
>     <XDoclet:ifHasClassTag tagName="ejb:bean" paramName="type">
>      <XDoclet:ifClassTagValueEquals tagName="ejb:bean" paramName="type" 
value="CMP">
 

_______________________________________________
Xdoclet-devel mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/xdoclet-devel

Reply via email to