Update of /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-spring/src/main/java/org/xdoclet/plugin/spring
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv9889/plugin-spring/src/main/java/org/xdoclet/plugin/spring
Modified Files:
SpringConfigXMLPlugin.java SpringConfigXMLPlugin.jelly
Log Message:
reworked jelly merge, moved taglib from web plugin to generama to provide standard
merge capabilities
Index: SpringConfigXMLPlugin.jelly
===================================================================
RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-spring/src/main/java/org/xdoclet/plugin/spring/SpringConfigXMLPlugin.jelly,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SpringConfigXMLPlugin.jelly 9 Feb 2006 10:32:53 -0000 1.1
--- SpringConfigXMLPlugin.jelly 24 Sep 2006 11:58:57 -0000 1.2
***************
*** 1,4 ****
<?xml version="1.0" encoding="UTF-8"?>
! <j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:jsl="jelly:jsl">
<x:doctype
name="beans"
--- 1,5 ----
<?xml version="1.0" encoding="UTF-8"?>
! <j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:jsl="jelly:jsl"
! xmlns:g='jelly:org.generama.jelly.GeneramaTaglib'>
<x:doctype
name="beans"
Index: SpringConfigXMLPlugin.java
===================================================================
RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-spring/src/main/java/org/xdoclet/plugin/spring/SpringConfigXMLPlugin.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SpringConfigXMLPlugin.java 9 Feb 2006 10:32:53 -0000 1.1
--- SpringConfigXMLPlugin.java 24 Sep 2006 11:58:57 -0000 1.2
***************
*** 36,68 ****
}
- public File getMergedir() {
- return mergeDir;
- }
-
- public void setMergedir(File mergeDir) {
- this.mergeDir = mergeDir;
- }
-
- /**
- * utility method used in the template to resolved merge file reference
- *
- * @param fileName
- * @return
- */
- public File getMergeFile(String fileName) {
- if (fileName != null && getMergedir() != null) {
- if (getMergedir().isDirectory()) {
- File[] files = getMergedir().listFiles();
-
- for (int i = 0; i < files.length; i++) {
- if (fileName.trim().equals(files[i].getName())) {
- return files[i];
- }
- }
- }
- }
- return null;
- }
/**
--- 36,40 ----
|
