Update of
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web/src/test/java/org/xdoclet/testapp/web/expected
In directory
sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv9889/plugin-web/src/test/java/org/xdoclet/testapp/web/expected
Modified Files:
web-2_2.xml web-2_3.xml web-2_4.xml
Log Message:
reworked jelly merge, moved taglib from web plugin to generama to provide
standard
merge capabilities
Index: web-2_4.xml
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web/src/test/java/org/xdoclet/testapp/web/expected/web-2_4.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** web-2_4.xml 4 Dec 2005 18:25:17 -0000 1.1
--- web-2_4.xml 24 Sep 2006 11:58:57 -0000 1.2
***************
*** 40,44 ****
<filter-class>org.xdoclet.testapp.web.ThirdFilter</filter-class>
</filter>
!
<!-- TODO : mergedir/filter-mappings.xml -->
<filter-mapping>
--- 40,49 ----
<filter-class>org.xdoclet.testapp.web.ThirdFilter</filter-class>
</filter>
! <filter>
! <filter-name>glum</filter-name>
! <display-name>Glum</display-name>
! <filter-class>org.xdoclet.testapp.web.BlaBla</filter-class>
! </filter>
!
<!-- TODO : mergedir/filter-mappings.xml -->
<filter-mapping>
Index: web-2_2.xml
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web/src/test/java/org/xdoclet/testapp/web/expected/web-2_2.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** web-2_2.xml 4 Dec 2005 18:25:17 -0000 1.1
--- web-2_2.xml 24 Sep 2006 11:58:57 -0000 1.2
***************
*** 1,6 ****
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application
2.2//EN" "http://java.sun.com/dtd/web-app_2_2.dtd";>
-
<web-app>
<!-- TODO : <distributable/>-->
--- 1,10 ----
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application
2.2//EN" "http://java.sun.com/dtd/web-app_2_2.dtd";>
<web-app>
+ <filter>
+ <filter-name>glum</filter-name>
+ <display-name>Glum</display-name>
+ <filter-class>org.xdoclet.testapp.web.BlaBla</filter-class>
+ </filter>
<!-- TODO : <distributable/>-->
***************
*** 50,56 ****
<resource-ref>
<description>Test resource reference</description>
! <res-ref-name>jdbc/EmployeeAppDB</res-ref-name>
! <res-type>javax.sql.DataSource</res-type>
! <res-auth>Container</res-auth>
</resource-ref>
--- 54,60 ----
<resource-ref>
<description>Test resource reference</description>
! <res-ref-name>jdbc/EmployeeAppDB</res-ref-name>
! <res-type>javax.sql.DataSource</res-type>
! <res-auth>Container</res-auth>
</resource-ref>
Index: web-2_3.xml
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web/src/test/java/org/xdoclet/testapp/web/expected/web-2_3.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** web-2_3.xml 4 Dec 2005 18:25:17 -0000 1.1
--- web-2_3.xml 24 Sep 2006 11:58:57 -0000 1.2
***************
*** 33,37 ****
<filter-class>org.xdoclet.testapp.web.ThirdFilter</filter-class>
</filter>
!
<!-- TODO : mergedir/filter-mappings.xml -->
<filter-mapping>
--- 33,42 ----
<filter-class>org.xdoclet.testapp.web.ThirdFilter</filter-class>
</filter>
! <filter>
! <filter-name>glum</filter-name>
! <display-name>Glum</display-name>
! <filter-class>org.xdoclet.testapp.web.BlaBla</filter-class>
! </filter>
!
<!-- TODO : mergedir/filter-mappings.xml -->
<filter-mapping>
-------------------------------------------------------------------------
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
