Update of
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-struts/src/test/java/org/xdoclet/plugin/struts
In directory
sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv9889/plugin-struts/src/test/java/org/xdoclet/plugin/struts
Modified Files:
StrutsConfigTest.java StrutsTilesTest.java
Log Message:
reworked jelly merge, moved taglib from web plugin to generama to provide
standard
merge capabilities
Index: StrutsConfigTest.java
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-struts/src/test/java/org/xdoclet/plugin/struts/StrutsConfigTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** StrutsConfigTest.java 10 Aug 2005 15:21:11 -0000 1.5
--- StrutsConfigTest.java 24 Sep 2006 11:58:57 -0000 1.6
***************
*** 31,36 ****
protected Plugin createPlugin(MetadataProvider metadataProvider,
WriterMapper writerMapper) {
StrutsConfigXMLPlugin plugin = (StrutsConfigXMLPlugin)
super.createPlugin(metadataProvider, writerMapper);
! URL completeDirURL = getResourceRelativeToThisPackage("complete");
! plugin.setMergedir(new File(completeDirURL.getPath(), "merge"));
plugin.setValidate(false); // due to complete/struts-config.xml is
not valid
return plugin;
--- 31,35 ----
protected Plugin createPlugin(MetadataProvider metadataProvider,
WriterMapper writerMapper) {
StrutsConfigXMLPlugin plugin = (StrutsConfigXMLPlugin)
super.createPlugin(metadataProvider, writerMapper);
! plugin.setMergedir("/org/xdoclet/plugin/struts/complete/merge/");
plugin.setValidate(false); // due to complete/struts-config.xml is
not valid
return plugin;
Index: StrutsTilesTest.java
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-struts/src/test/java/org/xdoclet/plugin/struts/StrutsTilesTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** StrutsTilesTest.java 10 Aug 2005 15:21:11 -0000 1.2
--- StrutsTilesTest.java 24 Sep 2006 11:58:57 -0000 1.3
***************
*** 31,36 ****
protected Plugin createPlugin(MetadataProvider metadataProvider,
WriterMapper writerMapper) {
StrutsTilesPlugin plugin = (StrutsTilesPlugin)
super.createPlugin(metadataProvider, writerMapper);
! URL completeDirURL =
getResourceRelativeToThisPackage("complete/merge");
! plugin.setMergedir(new File(completeDirURL.getPath()));
return plugin;
}
--- 31,35 ----
protected Plugin createPlugin(MetadataProvider metadataProvider,
WriterMapper writerMapper) {
StrutsTilesPlugin plugin = (StrutsTilesPlugin)
super.createPlugin(metadataProvider, writerMapper);
! plugin.setMergedir("/org/xdoclet/plugin/struts/complete/merge");
return plugin;
}
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
xdoclet-plugins-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xdoclet-plugins-commits
