Update of /cvsroot/xdoclet/xdoclet/modules/bea/src/xdoclet/modules/bea/wls/ejb/resources In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32282
Modified Files: weblogic-ejb-jar-xml.xdt Log Message: fixed fix for XDT-1525 Index: weblogic-ejb-jar-xml.xdt =================================================================== RCS file: /cvsroot/xdoclet/xdoclet/modules/bea/src/xdoclet/modules/bea/wls/ejb/resources/weblogic-ejb-jar-xml.xdt,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -r1.21 -r1.22 *** weblogic-ejb-jar-xml.xdt 14 Jan 2006 14:56:05 -0000 1.21 --- weblogic-ejb-jar-xml.xdt 17 Jan 2006 20:45:36 -0000 1.22 *************** *** 92,96 **** <type-version>5.1.0</type-version> </XDtConfig:ifConfigParamEquals> ! <XDtConfig:ifConfigParamNotEquals paramName="EjbSpec" value="1.1"> <type-version>6.0</type-version> </XDtConfig:ifConfigParamNotEquals> --- 92,96 ---- <type-version>5.1.0</type-version> </XDtConfig:ifConfigParamEquals> ! <XDtConfig:ifConfigParamNotEquals paramName="EjbSpec" value="1.1"> <type-version>6.0</type-version> </XDtConfig:ifConfigParamNotEquals> *************** *** 108,118 **** <type-version>5.1.0</type-version> </XDtConfig:ifConfigParamEquals> ! <XDtConfig:ifConfigParamNotEquals paramName="EjbSpec" value="1.1"> ! <XDtConfig:ifConfigParamEquals paramName="Version" value="6.1"> <type-version>6.0</type-version> - </XDtConfig:ifConfigParamEquals> - <XDtConfig:ifConfigParamGreaterOrEquals paramName="Version" value="7.0"> - <type-version>7.0</type-version> - </XDtConfig:ifConfigParamGreaterOrEquals> </XDtConfig:ifConfigParamNotEquals> <XDtConfig:ifConfigParamGreaterOrEquals paramName="Version" value="7.0"> --- 108,113 ---- <type-version>5.1.0</type-version> </XDtConfig:ifConfigParamEquals> ! <XDtConfig:ifConfigParamNotEquals paramName="EjbSpec" value="1.1"> <type-version>6.0</type-version> </XDtConfig:ifConfigParamNotEquals> <XDtConfig:ifConfigParamGreaterOrEquals paramName="Version" value="7.0"> *************** *** 173,187 **** <home-call-router-class-name><XDtClass:classTagValue tagName="weblogic:clustering" paramName="home-call-router-class-name"/></home-call-router-class-name> </XDtClass:ifHasClassTag> ! <XDtConfig:ifConfigParamGreaterOrEquals paramName="Version" value="8.1"> <XDtClass:ifHasClassTag tagName="weblogic:clustering" paramName="use-serverside-stubs"> <use-serverside-stubs><XDtClass:classTagValue tagName="weblogic:clustering" paramName="use-serverside-stubs" value="True,False"/></use-serverside-stubs> ! </XDtClass:ifHasClassTag> </XDtConfig:ifConfigParamGreaterOrEquals> ! <XDtClass:ifHasClassTag tagName="weblogic:clustering" paramName="stateless-bean-is-clusterable"> <stateless-bean-is-clusterable><XDtClass:classTagValue tagName="weblogic:clustering" paramName="stateless-bean-is-clusterable" values="True,False"/></stateless-bean-is-clusterable> </XDtClass:ifHasClassTag> ! <XDtConfig:ifConfigParamGreaterOrEquals paramName="Version" value="8.1"> <XDtClass:ifHasClassTag tagName="weblogic:clustering" paramName="stateless-bean-load-algorithm"> --- 168,182 ---- <home-call-router-class-name><XDtClass:classTagValue tagName="weblogic:clustering" paramName="home-call-router-class-name"/></home-call-router-class-name> </XDtClass:ifHasClassTag> ! <XDtConfig:ifConfigParamGreaterOrEquals paramName="Version" value="8.1"> <XDtClass:ifHasClassTag tagName="weblogic:clustering" paramName="use-serverside-stubs"> <use-serverside-stubs><XDtClass:classTagValue tagName="weblogic:clustering" paramName="use-serverside-stubs" value="True,False"/></use-serverside-stubs> ! </XDtClass:ifHasClassTag> </XDtConfig:ifConfigParamGreaterOrEquals> ! <XDtClass:ifHasClassTag tagName="weblogic:clustering" paramName="stateless-bean-is-clusterable"> <stateless-bean-is-clusterable><XDtClass:classTagValue tagName="weblogic:clustering" paramName="stateless-bean-is-clusterable" values="True,False"/></stateless-bean-is-clusterable> </XDtClass:ifHasClassTag> ! <XDtConfig:ifConfigParamGreaterOrEquals paramName="Version" value="8.1"> <XDtClass:ifHasClassTag tagName="weblogic:clustering" paramName="stateless-bean-load-algorithm"> *************** *** 194,198 **** </XDtClass:ifHasClassTag> </XDtConfig:ifConfigParamNotGreaterOrEquals> ! <XDtClass:ifHasClassTag tagName="weblogic:clustering" paramName="stateless-bean-call-router-class-name"> <stateless-bean-call-router-class-name><XDtClass:classTagValue tagName="weblogic:clustering" paramName="stateless-bean-call-router-class-name"/></stateless-bean-call-router-class-name> --- 189,193 ---- </XDtClass:ifHasClassTag> </XDtConfig:ifConfigParamNotGreaterOrEquals> ! <XDtClass:ifHasClassTag tagName="weblogic:clustering" paramName="stateless-bean-call-router-class-name"> <stateless-bean-call-router-class-name><XDtClass:classTagValue tagName="weblogic:clustering" paramName="stateless-bean-call-router-class-name"/></stateless-bean-call-router-class-name> *************** *** 200,204 **** <XDtClass:ifHasClassTag tagName="weblogic:clustering" paramName="stateless-bean-methods-are-idempotent"> <stateless-bean-methods-are-idempotent><XDtClass:classTagValue tagName="weblogic:clustering" paramName="stateless-bean-methods-are-idempotent" values="True,False"/></stateless-bean-methods-are-idempotent> ! </XDtClass:ifHasClassTag> </stateless-clustering> </XDtClass:ifHasClassTag> --- 195,199 ---- <XDtClass:ifHasClassTag tagName="weblogic:clustering" paramName="stateless-bean-methods-are-idempotent"> <stateless-bean-methods-are-idempotent><XDtClass:classTagValue tagName="weblogic:clustering" paramName="stateless-bean-methods-are-idempotent" values="True,False"/></stateless-bean-methods-are-idempotent> ! </XDtClass:ifHasClassTag> </stateless-clustering> </XDtClass:ifHasClassTag> *************** *** 225,229 **** </stateful-session-cache> </XDtClass:ifHasClassTag> ! <XDtConfig:ifConfigParamNotGreaterOrEquals paramName="Version" value="8.1"> <XDtClass:ifHasClassTag tagName="weblogic:lifecycle"> --- 220,224 ---- </stateful-session-cache> </XDtClass:ifHasClassTag> ! <XDtConfig:ifConfigParamNotGreaterOrEquals paramName="Version" value="8.1"> <XDtClass:ifHasClassTag tagName="weblogic:lifecycle"> *************** *** 235,239 **** </XDtClass:ifHasClassTag> </XDtConfig:ifConfigParamNotGreaterOrEquals> ! <XDtClass:ifHasClassTag tagName="weblogic:persistent-store-dir"> <persistent-store-dir><XDtClass:classTagValue tagName="weblogic:persistent-store-dir"/></persistent-store-dir> --- 230,234 ---- </XDtClass:ifHasClassTag> </XDtConfig:ifConfigParamNotGreaterOrEquals> ! <XDtClass:ifHasClassTag tagName="weblogic:persistent-store-dir"> <persistent-store-dir><XDtClass:classTagValue tagName="weblogic:persistent-store-dir"/></persistent-store-dir> *************** *** 250,254 **** <home-call-router-class-name><XDtClass:classTagValue tagName="weblogic:clustering" paramName="home-call-router-class-name"/></home-call-router-class-name> </XDtClass:ifHasClassTag> ! <XDtConfig:ifConfigParamGreaterOrEquals paramName="Version" value="8.1"> <XDtClass:ifHasClassTag tagName="weblogic:clustering" paramName="use-serverside-stubs"> --- 245,249 ---- <home-call-router-class-name><XDtClass:classTagValue tagName="weblogic:clustering" paramName="home-call-router-class-name"/></home-call-router-class-name> </XDtClass:ifHasClassTag> ! <XDtConfig:ifConfigParamGreaterOrEquals paramName="Version" value="8.1"> <XDtClass:ifHasClassTag tagName="weblogic:clustering" paramName="use-serverside-stubs"> *************** *** 256,260 **** </XDtClass:ifHasClassTag> </XDtConfig:ifConfigParamGreaterOrEquals> ! <XDtClass:ifHasClassTag tagName="weblogic:clustering" paramName="replication-type"> <replication-type><XDtClass:classTagValue tagName="weblogic:clustering" paramName="replication-type" values="InMemory,None"/></replication-type> --- 251,255 ---- </XDtClass:ifHasClassTag> </XDtConfig:ifConfigParamGreaterOrEquals> ! <XDtClass:ifHasClassTag tagName="weblogic:clustering" paramName="replication-type"> <replication-type><XDtClass:classTagValue tagName="weblogic:clustering" paramName="replication-type" values="InMemory,None"/></replication-type> *************** *** 265,269 **** <allow-concurrent-calls><XDtClass:classTagValue tagName="weblogic:allow-concurrent-calls" values="True,False"/></allow-concurrent-calls> </XDtClass:ifHasClassTag> ! <XDtConfig:ifConfigParamGreaterOrEquals paramName="Version" value="8.1"> <XDtClass:ifHasClassTag tagName="weblogic:allow-remove-during-transaction"> --- 260,264 ---- <allow-concurrent-calls><XDtClass:classTagValue tagName="weblogic:allow-concurrent-calls" values="True,False"/></allow-concurrent-calls> </XDtClass:ifHasClassTag> ! <XDtConfig:ifConfigParamGreaterOrEquals paramName="Version" value="8.1"> <XDtClass:ifHasClassTag tagName="weblogic:allow-remove-during-transaction"> *************** *** 271,275 **** </XDtClass:ifHasClassTag> </XDtConfig:ifConfigParamGreaterOrEquals> ! </stateful-session-descriptor> </XDtEjbSession:ifStatefulSession> --- 266,270 ---- </XDtClass:ifHasClassTag> </XDtConfig:ifConfigParamGreaterOrEquals> ! </stateful-session-descriptor> </XDtEjbSession:ifStatefulSession> *************** *** 349,353 **** </iiop-security-descriptor> </XDtClass:ifHasClassTag> ! </XDtConfig:ifConfigParamGreaterOrEquals> <reference-descriptor> <XDtEjbEnv:forAllTags tagName="ejb.resource-ref"> --- 344,348 ---- </iiop-security-descriptor> </XDtClass:ifHasClassTag> ! </XDtConfig:ifConfigParamGreaterOrEquals> <reference-descriptor> <XDtEjbEnv:forAllTags tagName="ejb.resource-ref"> *************** *** 398,402 **** </XDtEjbEnvEjbRef:ifHasParam> </XDtEjbEnvEjbRef:ifRemoteEjbRef> ! </XDtEjbEnvEjbRef:forAllEjbRefs> <XDtClass:forAllClassTags tagName="weblogic:ejb-reference-description"> <ejb-reference-description> --- 393,397 ---- </XDtEjbEnvEjbRef:ifHasParam> </XDtEjbEnvEjbRef:ifRemoteEjbRef> ! </XDtEjbEnvEjbRef:forAllEjbRefs> <XDtClass:forAllClassTags tagName="weblogic:ejb-reference-description"> <ejb-reference-description> *************** *** 415,419 **** </XDtEjbEnvEjbRef:ifHasParam> </XDtEjbEnvEjbRef:ifLocalEjbRef> ! </XDtEjbEnvEjbRef:forAllEjbRefs> <XDtClass:forAllClassTags tagName="weblogic:ejb-local-reference-description"> <ejb-local-reference-description> --- 410,414 ---- </XDtEjbEnvEjbRef:ifHasParam> </XDtEjbEnvEjbRef:ifLocalEjbRef> ! </XDtEjbEnvEjbRef:forAllEjbRefs> <XDtClass:forAllClassTags tagName="weblogic:ejb-local-reference-description"> <ejb-local-reference-description> *************** *** 424,432 **** </XDtConfig:ifConfigParamGreaterOrEquals> </reference-descriptor> ! <XDtClass:ifHasClassTag tagName="weblogic:enable-call-by-reference"> <enable-call-by-reference><XDtClass:classTagValue tagName="weblogic:enable-call-by-reference" values="True,False"/></enable-call-by-reference> </XDtClass:ifHasClassTag> ! <XDtConfig:ifConfigParamGreaterOrEquals paramName="Version" value="8.1"> <XDtClass:ifHasClassTag tagName="weblogic:clients-on-same-server"> --- 419,427 ---- </XDtConfig:ifConfigParamGreaterOrEquals> </reference-descriptor> ! <XDtClass:ifHasClassTag tagName="weblogic:enable-call-by-reference"> <enable-call-by-reference><XDtClass:classTagValue tagName="weblogic:enable-call-by-reference" values="True,False"/></enable-call-by-reference> </XDtClass:ifHasClassTag> ! <XDtConfig:ifConfigParamGreaterOrEquals paramName="Version" value="8.1"> <XDtClass:ifHasClassTag tagName="weblogic:clients-on-same-server"> *************** *** 435,441 **** <XDtClass:ifHasClassTag tagName="weblogic:run-as-principal-name"> <run-as-principal-name><XDtClass:classTagValue tagName="weblogic:run-as-principal-name"/></run-as-principal-name> ! </XDtClass:ifHasClassTag> </XDtConfig:ifConfigParamGreaterOrEquals> ! <XDtConfig:ifConfigParamNotGreaterOrEquals paramName="Version" value="8.1"> <XDtClass:ifHasClassTag tagName="weblogic:run-as-identity-principal"> --- 430,436 ---- <XDtClass:ifHasClassTag tagName="weblogic:run-as-principal-name"> <run-as-principal-name><XDtClass:classTagValue tagName="weblogic:run-as-principal-name"/></run-as-principal-name> ! </XDtClass:ifHasClassTag> </XDtConfig:ifConfigParamGreaterOrEquals> ! <XDtConfig:ifConfigParamNotGreaterOrEquals paramName="Version" value="8.1"> <XDtClass:ifHasClassTag tagName="weblogic:run-as-identity-principal"> *************** *** 455,459 **** </XDtClass:ifHasClassTag> </XDtConfig:ifConfigParamGreaterOrEquals> ! <XDtEjbMdb:ifNotMessageDriven> <XDtEjbIntf:ifRemoteEjb> --- 450,454 ---- </XDtClass:ifHasClassTag> </XDtConfig:ifConfigParamGreaterOrEquals> ! <XDtEjbMdb:ifNotMessageDriven> <XDtEjbIntf:ifRemoteEjb> *************** *** 464,468 **** </XDtEjbIntf:ifLocalEjb> </XDtEjbMdb:ifNotMessageDriven> ! <XDtConfig:ifConfigParamGreaterOrEquals paramName="Version" value="7.0"> <XDtClass:ifHasClassTag tagName="weblogic:dispatch-policy"> --- 459,463 ---- </XDtEjbIntf:ifLocalEjb> </XDtEjbMdb:ifNotMessageDriven> ! <XDtConfig:ifConfigParamGreaterOrEquals paramName="Version" value="7.0"> <XDtClass:ifHasClassTag tagName="weblogic:dispatch-policy"> *************** *** 470,491 **** </XDtClass:ifHasClassTag> </XDtConfig:ifConfigParamGreaterOrEquals> ! </weblogic-enterprise-bean> </XDtEjb:ifIsAConcreteEJBean> </XDtEjb:forAllBeans> ! <XDtMerge:merge file="weblogic-enterprise-beans.xml"> ! <!-- ! To add enterprise beans that you have deployment descriptor info for, add ! a file to your XDoclet merge directory called weblogic-enterprise-beans.xml that contains ! the <weblogic-enterprise-bean></weblogic-enterprise-bean> markup for those beans. ! --> </XDtMerge:merge> <XDtMerge:merge file="weblogic-security-role-assignment.xml"> ! <!-- ! To add a security-role-assignment section, add ! a file to your XDoclet merge directory called weblogic-security-role-assignment.xml that contains ! the <security-role-assignment></security-role-assignment> markup. ! --> </XDtMerge:merge> <XDtComment:comment> --- 465,486 ---- </XDtClass:ifHasClassTag> </XDtConfig:ifConfigParamGreaterOrEquals> ! </weblogic-enterprise-bean> </XDtEjb:ifIsAConcreteEJBean> </XDtEjb:forAllBeans> ! <XDtMerge:merge file="weblogic-enterprise-beans.xml"> ! <!-- ! To add enterprise beans that you have deployment descriptor info for, add ! a file to your XDoclet merge directory called weblogic-enterprise-beans.xml that contains ! the <weblogic-enterprise-bean></weblogic-enterprise-bean> markup for those beans. ! --> </XDtMerge:merge> <XDtMerge:merge file="weblogic-security-role-assignment.xml"> ! <!-- ! To add a security-role-assignment section, add ! a file to your XDoclet merge directory called weblogic-security-role-assignment.xml that contains ! the <security-role-assignment></security-role-assignment> markup. ! --> </XDtMerge:merge> <XDtComment:comment> *************** *** 494,502 **** <XDtMerge:merge file="weblogic-run-as-role-assignment.xml"> ! <!-- ! To add a run-as-role-assignment section, add ! a file to your XDoclet merge directory called weblogic-run-as-role-assignment.xml that contains ! the <run-as-role-assignment></run-as-role-assignment> markup. ! --> </XDtMerge:merge> --- 489,497 ---- <XDtMerge:merge file="weblogic-run-as-role-assignment.xml"> ! <!-- ! To add a run-as-role-assignment section, add ! a file to your XDoclet merge directory called weblogic-run-as-role-assignment.xml that contains ! the <run-as-role-assignment></run-as-role-assignment> markup. ! --> </XDtMerge:merge> *************** *** 579,588 **** </idempotent-methods> </XDtConfig:ifConfigParamGreaterOrEquals> ! ! <XDtConfig:ifConfigParamGreaterOrEquals paramName="Version" value="8.1"> <XDtConfig:ifHasConfigParam paramName="EnableBeanClassRedeploy"> <enable-bean-class-redeploy><XDtConfig:configParameterValue paramName="EnableBeanClassRedeploy" /></enable-bean-class-redeploy> ! </XDtConfig:ifHasConfigParam> </XDtConfig:ifConfigParamGreaterOrEquals> --- 574,583 ---- </idempotent-methods> </XDtConfig:ifConfigParamGreaterOrEquals> ! ! <XDtConfig:ifConfigParamGreaterOrEquals paramName="Version" value="8.1"> <XDtConfig:ifHasConfigParam paramName="EnableBeanClassRedeploy"> <enable-bean-class-redeploy><XDtConfig:configParameterValue paramName="EnableBeanClassRedeploy" /></enable-bean-class-redeploy> ! </XDtConfig:ifHasConfigParam> </XDtConfig:ifConfigParamGreaterOrEquals> ------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 _______________________________________________ xdoclet-devel mailing list xdoclet-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/xdoclet-devel