Update of /cvsroot/xdoclet/xdoclet/modules/jboss/src/xdoclet/modules/jboss/ejb
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13891/xdoclet/modules/jboss/src/xdoclet/modules/jboss/ejb
Modified Files:
JBossSubTask.java
Log Message:
Datasource mapping and datasource only need to go together in 3.x servers.
XDT-1086
Index: JBossSubTask.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/jboss/src/xdoclet/modules/jboss/ejb/JBossSubTask.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** JBossSubTask.java 12 Nov 2004 20:10:19 -0000 1.32
--- JBossSubTask.java 16 Jan 2005 19:56:13 -0000 1.33
***************
*** 467,473 ****
// super.validateOptions();
! if ((hasDatasource() && !hasDatasourceMapping()) ||
! (!hasDatasource() && hasDatasourceMapping())) {
! throw new
XDocletException(Translator.getString(XDocletModulesJBossEjbMessages.class,
XDocletModulesJBossEjbMessages.DATASOURCE_DATASOURCEMAPPING_PARAMETER_MISSING,
new String[]{hasDatasource() ? "datasource" : "datasourcemapping"}));
}
}
--- 467,476 ----
// super.validateOptions();
! if (getVersion().startsWith("3")) {
! // 2.4 and 4.0 don't require that both params are there.
! if ((hasDatasource() && !hasDatasourceMapping()) ||
! (!hasDatasource() && hasDatasourceMapping())) {
! throw new
XDocletException(Translator.getString(XDocletModulesJBossEjbMessages.class,
XDocletModulesJBossEjbMessages.DATASOURCE_DATASOURCEMAPPING_PARAMETER_MISSING,
new String[]{hasDatasource() ? "datasource" : "datasourcemapping"}));
! }
}
}
-------------------------------------------------------
The SF.Net email is sponsored by: Beat the post-holiday blues
Get a FREE limited edition SourceForge.net t-shirt from ThinkGeek.
It's fun and FREE -- well, almost....http://www.thinkgeek.com/sfshirt
_______________________________________________
xdoclet-devel mailing list
xdoclet-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
