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

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

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

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


Index: MergeFileTest.java
===================================================================
RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-castor/src/test/java/org/xdoclet/plugin/castor/MergeFileTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MergeFileTest.java	22 Jun 2005 08:19:25 -0000	1.1
--- MergeFileTest.java	24 Sep 2006 11:58:56 -0000	1.2
***************
*** 33,38 ****
      protected Plugin createPlugin(MetadataProvider metadataProvider, WriterMapper writerMapper) {
          CastorMappingXMLPlugin retPlugin = (CastorMappingXMLPlugin) super.createPlugin(metadataProvider, writerMapper);
!         URL reader = getResourceRelativeToThisPackage("simple/merge");
!         retPlugin.setMergedir(new File(reader.getPath()));
          return retPlugin;
      }
--- 33,37 ----
      protected Plugin createPlugin(MetadataProvider metadataProvider, WriterMapper writerMapper) {
          CastorMappingXMLPlugin retPlugin = (CastorMappingXMLPlugin) super.createPlugin(metadataProvider, writerMapper);
!         retPlugin.setMergedir("/org/xdoclet/plugin/castor/simple/merge/");
          return retPlugin;
      }