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-serv29547/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:
cleaned up dependencies, reworked merging ( at least for jelly,
now taglib in generama ), test are running. wwb plugin needs attentioo
veocuity merghing too
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.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** web-2_4.xml 24 Sep 2006 11:58:57 -0000 1.2
--- web-2_4.xml 24 Sep 2006 18:20:03 -0000 1.3
***************
*** 2,8 ****
<web-app xmlns="http://java.sun.com/xml/ns/j2ee";
! xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
! xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";
! version="2.4">
<!-- TODO : <distributable/>-->
--- 2,8 ----
<web-app xmlns="http://java.sun.com/xml/ns/j2ee";
! xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
! xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";
! version="2.4">
<!-- TODO : <distributable/>-->
***************
*** 40,50 ****
<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>
<filter-name>TimerFilter</filter-name>
--- 40,57 ----
<filter-class>org.xdoclet.testapp.web.ThirdFilter</filter-class>
</filter>
+ <!--start merging from
source:org/xdoclet/testapp/web/mergedir/filters.xml-->
<filter>
! <description>blurge bang</description>
! <display-name>Merged Filter</display-name>
! <icon>
! <small-icon>icon239.gif</small-icon>
! </icon>
! <filter-name>MergedFilter</filter-name>
! <filter-class>org.xdoclet.testapp.web.MergedFilter</filter-class>
</filter>
+ <!--end merging from source:org/xdoclet/testapp/web/mergedir/filters.xml-->
!
!
<filter-mapping>
<filter-name>TimerFilter</filter-name>
***************
*** 65,84 ****
<servlet-name>/third</servlet-name>
</filter-mapping>
<!-- TODO : mergedir/listeners.xml -->
<listener>
!
<listener-class>org.xdoclet.testapp.web.TestSessionListener</listener-class>
</listener>
<listener>
!
<listener-class>org.xdoclet.testapp.web.TestServletContextListener</listener-class>
</listener>
<listener>
!
<listener-class>org.xdoclet.testapp.web.DummyServletRequestListener</listener-class>
</listener>
<listener>
! <listener-class>org.xdoclet.testapp.web.SimpleListener</listener-class>
</listener>
--- 72,97 ----
<servlet-name>/third</servlet-name>
</filter-mapping>
+ <!--start merging from
source:org/xdoclet/testapp/web/mergedir/filter-mappings.xml-->
+ <filter-mapping>
+ <filter-name>MergedFilter</filter-name>
+ <servlet-name>/merged</servlet-name>
+ </filter-mapping>
+ <!--end merging from
source:org/xdoclet/testapp/web/mergedir/filter-mappings.xml-->
<!-- TODO : mergedir/listeners.xml -->
<listener>
!
<listener-class>org.xdoclet.testapp.web.TestSessionListener</listener-class>
</listener>
<listener>
!
<listener-class>org.xdoclet.testapp.web.TestServletContextListener</listener-class>
</listener>
<listener>
!
<listener-class>org.xdoclet.testapp.web.DummyServletRequestListener</listener-class>
</listener>
<listener>
!
<listener-class>org.xdoclet.testapp.web.SimpleListener</listener-class>
</listener>
***************
*** 137,144 ****
<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>
! <res-sharing-scope>Shareable</res-sharing-scope>
</resource-ref>
--- 150,157 ----
<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>
! <res-sharing-scope>Shareable</res-sharing-scope>
</resource-ref>
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.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** web-2_2.xml 24 Sep 2006 11:58:57 -0000 1.2
--- web-2_2.xml 24 Sep 2006 18:20:03 -0000 1.3
***************
*** 2,10 ****
<!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/>-->
--- 2,5 ----
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.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** web-2_3.xml 24 Sep 2006 11:58:57 -0000 1.2
--- web-2_3.xml 24 Sep 2006 18:20:03 -0000 1.3
***************
*** 1,10 ****
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application
2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd";>
-
<web-app>
<!-- TODO : <distributable/>-->
<!-- TODO : mergedir/filters.xml (separate from filter-mappings) -->
<filter>
! <icon><small-icon>iconOne.gif</small-icon></icon>
<filter-name>TimerFilter</filter-name>
<display-name>Timer Filter</display-name>
--- 1,11 ----
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application
2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd";>
<web-app>
<!-- TODO : <distributable/>-->
<!-- TODO : mergedir/filters.xml (separate from filter-mappings) -->
<filter>
! <icon>
! <small-icon>iconOne.gif</small-icon>
! </icon>
<filter-name>TimerFilter</filter-name>
<display-name>Timer Filter</display-name>
***************
*** 22,26 ****
</filter>
<filter>
! <icon><small-icon>icon2.gif</small-icon></icon>
<filter-name>SecondFilter</filter-name>
<display-name>Second Filter</display-name>
--- 23,29 ----
</filter>
<filter>
! <icon>
! <small-icon>icon2.gif</small-icon>
! </icon>
<filter-name>SecondFilter</filter-name>
<display-name>Second Filter</display-name>
***************
*** 33,43 ****
<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>
<filter-name>TimerFilter</filter-name>
--- 36,52 ----
<filter-class>org.xdoclet.testapp.web.ThirdFilter</filter-class>
</filter>
+ <!--start merging from
source:org/xdoclet/testapp/web/mergedir/filters.xml-->
<filter>
! <icon>
! <small-icon>icon239.gif</small-icon>
! </icon>
! <filter-name>MergedFilter</filter-name>
! <display-name>Merged Filter</display-name>
! <filter-class>org.xdoclet.testapp.web.MergedFilter</filter-class>
! <description>blurge bang</description>
</filter>
! <!--end merging from
source:org/xdoclet/testapp/web/mergedir/filters.xml-->
!
!
<filter-mapping>
<filter-name>TimerFilter</filter-name>
***************
*** 58,73 ****
<servlet-name>/third</servlet-name>
</filter-mapping>
<!-- TODO : mergedir/listeners.xml -->
<listener>
!
<listener-class>org.xdoclet.testapp.web.TestSessionListener</listener-class>
</listener>
<listener>
!
<listener-class>org.xdoclet.testapp.web.TestServletContextListener</listener-class>
</listener>
<listener>
! <listener-class>org.xdoclet.testapp.web.SimpleListener</listener-class>
</listener>
--- 67,88 ----
<servlet-name>/third</servlet-name>
</filter-mapping>
+ <!--start merging from
source:org/xdoclet/testapp/web/mergedir/filter-mappings.xml-->
+ <filter-mapping>
+ <filter-name>MergedFilter</filter-name>
+ <servlet-name>/merged</servlet-name>
+ </filter-mapping>
+ <!--end merging from
source:org/xdoclet/testapp/web/mergedir/filter-mappings.xml-->
<!-- TODO : mergedir/listeners.xml -->
<listener>
!
<listener-class>org.xdoclet.testapp.web.TestSessionListener</listener-class>
</listener>
<listener>
!
<listener-class>org.xdoclet.testapp.web.TestServletContextListener</listener-class>
</listener>
<listener>
!
<listener-class>org.xdoclet.testapp.web.SimpleListener</listener-class>
</listener>
***************
*** 88,92 ****
</init-param>
<load-on-startup>1</load-on-startup>
! <run-as><role-name>TestRole</role-name></run-as>
<security-role-ref>
<description>A description for the test link role</description>
--- 103,109 ----
</init-param>
<load-on-startup>1</load-on-startup>
! <run-as>
! <role-name>TestRole</role-name>
! </run-as>
<security-role-ref>
<description>A description for the test link role</description>
***************
*** 124,131 ****
<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>
! <res-sharing-scope>Shareable</res-sharing-scope>
</resource-ref>
--- 141,148 ----
<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>
! <res-sharing-scope>Shareable</res-sharing-scope>
</resource-ref>
-------------------------------------------------------------------------
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
