Update of /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web/src/test/java/org/xdoclet/plugin/web
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29547/plugin-web/src/test/java/org/xdoclet/plugin/web
Modified Files:
AbstractWebPluginTestCase.java WebPluginServlet23TestCase.java
WebPluginServlet24TestCase.java
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: AbstractWebPluginTestCase.java
===================================================================
RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web/src/test/java/org/xdoclet/plugin/web/AbstractWebPluginTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AbstractWebPluginTestCase.java 24 Sep 2006 11:58:57 -0000 1.2
--- AbstractWebPluginTestCase.java 24 Sep 2006 18:20:03 -0000 1.3
***************
*** 24,34 ****
plugin.setServletversion(getTestedServletVersion());
plugin.setValidate(true);
! plugin.setMergedir("org/xdoclet/testapp/web/merge/");
return plugin;
}
protected MetadataProvider createMetadataProvider() throws IOException {
! URL basedir = getClass().getClassLoader().getResource(".");
! return new QDoxMetadataProvider(new File(basedir.getPath(), "../../../testapp-web/src/main/java/org/xdoclet/testapp/web"));
}
--- 24,34 ----
plugin.setServletversion(getTestedServletVersion());
plugin.setValidate(true);
! plugin.setMergedir("org/xdoclet/testapp/web/mergedir/");
return plugin;
}
protected MetadataProvider createMetadataProvider() throws IOException {
! URL reader = getClass().getResource("/org/xdoclet/testapp/web");
! return new QDoxMetadataProvider(new File(reader.getPath()));
}
Index: WebPluginServlet23TestCase.java
===================================================================
RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web/src/test/java/org/xdoclet/plugin/web/WebPluginServlet23TestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** WebPluginServlet23TestCase.java 4 Dec 2005 18:25:17 -0000 1.1
--- WebPluginServlet23TestCase.java 24 Sep 2006 18:20:03 -0000 1.2
***************
*** 6,10 ****
public class WebPluginServlet23TestCase extends AbstractWebPluginTestCase {
protected String getTestedServletVersion() {
! return "2.2";
}
}
--- 6,10 ----
public class WebPluginServlet23TestCase extends AbstractWebPluginTestCase {
protected String getTestedServletVersion() {
! return "2.3";
}
}
Index: WebPluginServlet24TestCase.java
===================================================================
RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web/src/test/java/org/xdoclet/plugin/web/WebPluginServlet24TestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** WebPluginServlet24TestCase.java 4 Dec 2005 18:25:17 -0000 1.1
--- WebPluginServlet24TestCase.java 24 Sep 2006 18:20:03 -0000 1.2
***************
*** 6,10 ****
public class WebPluginServlet24TestCase extends AbstractWebPluginTestCase {
protected String getTestedServletVersion() {
! return "2.2";
}
}
--- 6,10 ----
public class WebPluginServlet24TestCase extends AbstractWebPluginTestCase {
protected String getTestedServletVersion() {
! return "2.4";
}
}
|
