Update of
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web/src/main/java/org/xdoclet/plugin/web
In directory
sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29547/plugin-web/src/main/java/org/xdoclet/plugin/web
Modified Files:
WebPlugin.java WebPlugin.jelly
Log Message:
cleaned up dependencies, reworked merging ( at least for jelly,
now taglib in generama ), test are running. wwb plugin needs attentioo
veocuity merghing too
Index: WebPlugin.java
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web/src/main/java/org/xdoclet/plugin/web/WebPlugin.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** WebPlugin.java 24 Sep 2006 11:58:57 -0000 1.25
--- WebPlugin.java 24 Sep 2006 18:20:03 -0000 1.26
***************
*** 61,66 ****
}
- protected String mergeDir;
-
private String publicId = WebUtils.WEBXML_PUBLIC_ID_2_3;
--- 61,64 ----
***************
*** 99,115 ****
}
- /**
- * base path to resource directory containing resources to be merged
they
- * shall be made available on class path
- *
- * @return
- */
- public String getMergeDir() {
- return mergeDir;
- }
-
- public void setMergeDir(String mergeDir) {
- this.mergeDir = mergeDir;
- }
/**
--- 97,100 ----
***************
*** 143,169 ****
}
! /**
! * Utility method called from jelly script to resolve a mergeFile
reference
! *
! * @param mergeFile
! * The mergeFile to look for
! *
! * @return A File for mergeFile
! */
! // public File getMergeFile(String mergeFile) {
! // if ((mergeFile != null) && (mergeDir != null) &&
mergeDir.isDirectory()) {
! // // The listing of mergeDir's files avoid possibly
security issues in
! // // path resolving (paranoid?)
! // File[] files = mergeDir.listFiles();
! //
! // for (int i = 0; i < files.length; i++) {
! // if
(mergeFile.trim().equals(files[i].getName())) {
! // return files[i];
! // }
! // }
! // }
! //
! // return null;
! // }
public String getPublicId() {
--- 128,132 ----
}
!
public String getPublicId() {
***************
*** 230,242 ****
}
- /**
- * Setter for mergeDir property
- *
- * @param mergeDir
- * The value for the property
- */
- public void setMergedir(String mergeDir) {
- this.mergeDir = mergeDir;
- }
public void setServletversion(String servletversion) {
--- 193,196 ----
Index: WebPlugin.jelly
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web/src/main/java/org/xdoclet/plugin/web/WebPlugin.jelly,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** WebPlugin.jelly 24 Sep 2006 11:58:57 -0000 1.22
--- WebPlugin.jelly 24 Sep 2006 18:20:03 -0000 1.23
***************
*** 41,46 ****
<!--TODO : distributable : add this tag conditionaly/-->
!
! <!-- filters -->
<j:forEach var="filter" items="${plugin.filters}">
<filter>
--- 41,47 ----
<!--TODO : distributable : add this tag conditionaly/-->
! <!-- we just skip all the filter stuf, if servlet version is belov
2.3 -->
! <j:if test="${plugin.webUtils.isMinimumServletVersion('2.3')}">
! <!-- filters -->
<j:forEach var="filter" items="${plugin.filters}">
<filter>
***************
*** 66,79 ****
</filter>
</j:forEach>
! <g:merge file="filters.xml">
<x:comment>
To add filters that you have deployment descriptor info
for,
add a file to your XDoclet merge directory called
filters.xml
! that contains the <filter></filter> markup for those
beans.
Define root element as <j:jelly
xmlns:j="jelly:core"/>
</x:comment>
</g:merge>
! <!-- filter-mappings -->
<j:forEach var="filter" items="${plugin.filters}">
<j:forEach var="mapping"
items="${filter.getTagsByName('web.filter-mapping')}">
--- 67,80 ----
</filter>
</j:forEach>
! <g:merge file="filters.xml" inherit="true">
<x:comment>
To add filters that you have deployment descriptor info
for,
add a file to your XDoclet merge directory called
filters.xml
! that contains the bla bla <filter></filter> markup for
those beans.
Define root element as <j:jelly
xmlns:j="jelly:core"/>
</x:comment>
</g:merge>
! <!-- filter-mappings -->
<j:forEach var="filter" items="${plugin.filters}">
<j:forEach var="mapping"
items="${filter.getTagsByName('web.filter-mapping')}">
***************
*** 94,98 ****
</g:merge>
! <!-- listeners -->
<j:forEach var="listener"
items="${plugin.webUtils.getListeners(metadata)}">
<listener>
--- 95,99 ----
</g:merge>
! <!-- listeners -->
<j:forEach var="listener"
items="${plugin.webUtils.getListeners(metadata)}">
<listener>
***************
*** 108,112 ****
</x:comment>
</g:merge>
!
<!-- servlets -->
<j:forEach var="servlet" items="${plugin.servlets}">
--- 109,113 ----
</x:comment>
</g:merge>
! </j:if>
<!-- servlets -->
<j:forEach var="servlet" items="${plugin.servlets}">
-------------------------------------------------------------------------
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
