Update of
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web/src/test/java/org/xdoclet/testapp/web/expected
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22748/plugin-web/src/test/java/org/xdoclet/testapp/web/expected
Modified Files:
taglib2_0.tld
Added Files:
web-24.xml
Log Message:
XDP-93 added missing dependent xsd/dtd's + moved them to subdir - !! tests are
still failing :(
--- NEW FILE: web-24.xml ---
<?xml version="1.0" encoding="ISO-8859-1"?>
<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/>-->
<!-- TODO : mergedir/filters.xml (separate from filter-mappings) -->
<filter>
<description>The description of the TimerFilter</description>
<display-name>Timer Filter</display-name>
<icon><small-icon>iconOne.gif</small-icon></icon>
<filter-name>TimerFilter</filter-name>
<filter-class>org.xdoclet.testapp.web.TimerFilter</filter-class>
<init-param>
<param-name>param1</param-name>
<param-value>value1</param-value>
</init-param>
<init-param>
<description>the second parameter to the Timer Filter</description>
<param-name>param2</param-name>
<param-value>value2</param-value>
</init-param>
</filter>
<filter>
<display-name>Second Filter</display-name>
<icon><small-icon>icon2.gif</small-icon></icon>
<filter-name>SecondFilter</filter-name>
<filter-class>org.xdoclet.testapp.web.SecondFilter</filter-class>
</filter>
<filter>
<description>My 3rd filter is really cool</description>
<display-name>Third Filter</display-name>
<filter-name>ThirdFilter</filter-name>
<filter-class>org.xdoclet.testapp.web.ThirdFilter</filter-class>
</filter>
<!-- TODO : mergedir/filter-mappings.xml -->
<filter-mapping>
<filter-name>TimerFilter</filter-name>
<url-pattern>*.xml</url-pattern>
</filter-mapping>
<filter-mapping>
<filter-name>SecondFilter</filter-name>
<url-pattern>/second</url-pattern>
</filter-mapping>
<filter-mapping>
<filter-name>SecondFilter</filter-name>
<url-pattern>/other/mapping</url-pattern>
</filter-mapping>
<filter-mapping>
<filter-name>ThirdFilter</filter-name>
<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>
<!-- TODO : mergedir/servlets.xml (excluding servlet-mappings)-->
<servlet>
<description>This is a description for the simple Velocity
servlet</description>
<display-name>Simple Velocity Servlet</display-name>
<servlet-name>SimpleVelocityServlet</servlet-name>
<servlet-class>org.xdoclet.testapp.web.SimpleVelocityServlet</servlet-class>
<init-param>
<description>This is a description for the 1st init-param of the
simple Velocity servlet</description>
<param-name>param1</param-name>
<param-value>value1</param-value>
</init-param>
<init-param>
<param-name>param2</param-name>
<param-value>value2</param-value>
</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>
<role-name>LinkedTestRole</role-name>
<role-link>TestRole</role-link>
</security-role-ref>
<security-role-ref>
<role-name>YetAnotherRole</role-name>
<role-link>AnotherRole</role-link>
</security-role-ref>
</servlet>
<!-- TODO : mergedir/servlets-mappings.xml (excluding servlet-mappings)-->
<servlet-mapping>
<servlet-name>SimpleVelocityServlet</servlet-name>
<url-pattern>/simple/*</url-pattern>
</servlet-mapping>
<!-- TODO : mergedir/mime-mappings.xml -->
<!-- TODO : mergedir/error-pages.xml -->
<!-- TODO : mergdir/taglibs.xml -->
<!--taglib>
<taglib-uri>http://java.sun.com/jstl/ea/core</taglib-uri>
<taglib-location>/WEB-INF/c.tld</taglib-location>
</taglib>-->
<resource-env-ref>
<description>Test resource env ref</description>
<resource-env-ref-name>jms/StockQueue</resource-env-ref-name>
<resource-env-ref-type>javax.jms.Queue</resource-env-ref-type>
</resource-env-ref>
<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>
<!-- TODO : mergedir/web-security.xml ( security settings for your web app)
-->
<!-- TODO : security-role-ref should come before resource-* ??? that's how
it seems to be in xdoclet1.2 -->
<security-role>
<description>A description for the test role</description>
<role-name>TestRole</role-name>
</security-role>
<security-role>
<role-name>AnotherRole</role-name>
</security-role>
<env-entry>
<description>a test string for env entry!?</description>
<env-entry-name>TestEnvName</env-entry-name>
<env-entry-type>java.lang.String</env-entry-type>
<env-entry-value>testString</env-entry-value>
</env-entry>
<ejb-ref>
<description>A test reference to the Account EJB</description>
<ejb-ref-name>Account</ejb-ref-name>
<ejb-ref-type>Entity</ejb-ref-type>
<home>test.interfaces.AccountHome</home>
<remote>test.interfaces.Account</remote>
<ejb-link>Account</ejb-link>
</ejb-ref>
<ejb-local-ref>
<description>A test ref to the local Dummy Session Bean</description>
<ejb-ref-name>Dummy</ejb-ref-name>
<ejb-ref-type>Session</ejb-ref-type>
<local-home>test.interfaces.DummyLocalHome</local-home>
<local>test.interfaces.DummyLocal</local>
<ejb-link>Dummy</ejb-link>
</ejb-local-ref>
</web-app>
Index: taglib2_0.tld
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web/src/test/java/org/xdoclet/testapp/web/expected/taglib2_0.tld,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** taglib2_0.tld 30 Aug 2005 02:03:06 -0000 1.3
--- taglib2_0.tld 2 Dec 2005 20:32:35 -0000 1.4
***************
*** 17,20 ****
--- 17,23 ----
</listener>
<listener>
+
<listener-class>org.xdoclet.testapp.web.DummyServletRequestListener</listener-class>
+ </listener>
+ <listener>
<listener-class>org.xdoclet.testapp.web.SimpleListener</listener-class>
</listener>
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
xdoclet-plugins-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xdoclet-plugins-commits
