[xdoclet-plugins-commits] xdoclet-plugins/plugin-struts/src/main/java/org/xdoclet/plugin/struts StrutsConfigXMLPlugin.java, 1.6, 1.7 StrutsTilesPlugin.java, 1.2, 1.3

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

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

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


Index: StrutsTilesPlugin.java
===================================================================
RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-struts/src/main/java/org/xdoclet/plugin/struts/StrutsTilesPlugin.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** StrutsTilesPlugin.java	10 Aug 2005 15:21:10 -0000	1.2
--- StrutsTilesPlugin.java	24 Sep 2006 11:58:57 -0000	1.3
***************
*** 56,82 ****
      }
  
-     public File getMergedir() {
-         return mergedir;
-     }
- 
-     public void setMergedir(File mergefile) {
-         this.mergedir = mergefile;
-     }
- 
-     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;
-     }
  
      public void start() {
--- 56,60 ----

Index: StrutsConfigXMLPlugin.java
===================================================================
RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-struts/src/main/java/org/xdoclet/plugin/struts/StrutsConfigXMLPlugin.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** StrutsConfigXMLPlugin.java	10 Aug 2005 15:21:10 -0000	1.6
--- StrutsConfigXMLPlugin.java	24 Sep 2006 11:58:57 -0000	1.7
***************
*** 37,41 ****
      private Collection actionClasses;
      private Collection actionFormClasses;
-     private File mergeDir;
      private String fileName = "struts-config.xml";
      private String mappingType;
--- 37,40 ----
***************
*** 99,126 ****
      }
  
-     public File getMergedir() {
-         return mergeDir;
-     }
- 
-     public void setMergedir(File mergeDir) {
-         this.mergeDir = mergeDir;
-     }
- 
-     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;
-     }
- 
      public void start() {
          this.setFilereplace(this.getFilename());
--- 98,101 ----