[xdoclet-plugins-commits] xdoclet-plugins/plugin-web/src/test/java/org/xdoclet/plugin/web AbstractWebPluginTestCase.java, 1.1, 1.2

[Konstantin P. <ko...@us...>]

Update of /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web/src/test/java/org/xdoclet/plugin/web
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv9889/plugin-web/src/test/java/org/xdoclet/plugin/web

Modified Files:
	AbstractWebPluginTestCase.java 
Log Message:
reworked jelly merge, moved taglib from web plugin to generama to provide standard 
merge capabilities


Index: AbstractWebPluginTestCase.java
===================================================================
RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web/src/test/java/org/xdoclet/plugin/web/AbstractWebPluginTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AbstractWebPluginTestCase.java	4 Dec 2005 18:25:17 -0000	1.1
--- AbstractWebPluginTestCase.java	24 Sep 2006 11:58:57 -0000	1.2
***************
*** 24,27 ****
--- 24,28 ----
          plugin.setServletversion(getTestedServletVersion());
          plugin.setValidate(true);
+         plugin.setMergedir("org/xdoclet/testapp/web/merge/");
          return plugin;
      }