Update of
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web/src/test/java/org/xdoclet/plugin/web
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19756/src/test/java/org/xdoclet/plugin/web
Modified Files:
Taglib2PluginTestCase.java TaglibPluginTestCase.java
WebPluginTestCase.java
Log Message:
Moving to generama 1.1.1-SNAPSHOT
Index: Taglib2PluginTestCase.java
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web/src/test/java/org/xdoclet/plugin/web/Taglib2PluginTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Taglib2PluginTestCase.java 4 Feb 2005 00:32:27 -0000 1.1
--- Taglib2PluginTestCase.java 31 May 2005 11:26:43 -0000 1.2
***************
*** 1,9 ****
package org.xdoclet.plugin.web;
! import org.generama.MetadataProvider;
! import org.generama.Plugin;
! import org.generama.WriterMapper;
! import org.generama.JellyTemplateEngine;
! import org.generama.QDoxCapableMetadataProvider;
import org.generama.tests.AbstractXMLGeneratingPluginTestCase;
import org.xdoclet.QDoxMetadataProvider;
--- 1,5 ----
package org.xdoclet.plugin.web;
! import org.generama.*;
import org.generama.tests.AbstractXMLGeneratingPluginTestCase;
import org.xdoclet.QDoxMetadataProvider;
***************
*** 15,39 ****
/**
* @author Grégory Joseph(moins_moins)
- * @author $Author$ (last edit)
- * @version $Revision$
*/
public class Taglib2PluginTestCase extends
AbstractXMLGeneratingPluginTestCase {
-
- protected void setUp() throws Exception {
- super.setUp();
- registerDtd(TaglibPlugin.PUBLIC_ID_1_2,
getResourceURLRelativeToThisPackage("web-jsptaglibrary_1_2.dtd"));
- }
-
protected Plugin createPlugin(MetadataProvider metadataProvider,
WriterMapper writerMapper) throws Exception {
TaglibPlugin plugin = new TaglibPlugin(new JellyTemplateEngine(),
(QDoxCapableMetadataProvider) metadataProvider, writerMapper);
plugin.setJspversion("2.0");
return plugin;
}
protected MetadataProvider createMetadataProvider() throws IOException {
! String basedir = System.getProperty("xdoclet.web.home");
! assertNotNull(basedir);
! File testAppDir = new File(basedir,
"../testapp-web/src/main/java/org/xdoclet/testapp/web");
! return new QDoxMetadataProvider(testAppDir);
}
--- 11,26 ----
/**
* @author Grégory Joseph(moins_moins)
*/
public class Taglib2PluginTestCase extends
AbstractXMLGeneratingPluginTestCase {
protected Plugin createPlugin(MetadataProvider metadataProvider,
WriterMapper writerMapper) throws Exception {
TaglibPlugin plugin = new TaglibPlugin(new JellyTemplateEngine(),
(QDoxCapableMetadataProvider) metadataProvider, writerMapper);
plugin.setJspversion("2.0");
+ plugin.setValidate(false); //We cant use validation there because of
generated taglib has no schema
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"));
}
***************
*** 41,44 ****
return
getResourceRelativeToThisPackage("../../testapp/web/expected/taglib2_0.tld");
}
-
}
--- 28,30 ----
Index: TaglibPluginTestCase.java
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web/src/test/java/org/xdoclet/plugin/web/TaglibPluginTestCase.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** TaglibPluginTestCase.java 13 Nov 2004 09:27:07 -0000 1.11
--- TaglibPluginTestCase.java 31 May 2005 11:26:43 -0000 1.12
***************
*** 15,37 ****
/**
* @author Grégory Joseph(moins_moins)
- * @author $Author$ (last edit)
- * @version $Revision$
*/
public class TaglibPluginTestCase extends AbstractXMLGeneratingPluginTestCase
{
!
! protected void setUp() throws Exception {
! super.setUp();
! registerDtd(TaglibPlugin.PUBLIC_ID_1_2,
getResourceURLRelativeToThisPackage("web-jsptaglibrary_1_2.dtd"));
! }
!
! protected Plugin createPlugin(MetadataProvider metadataProvider,
WriterMapper writerMapper) throws Exception {
! return new TaglibPlugin(new JellyTemplateEngine(),
(QDoxCapableMetadataProvider) metadataProvider, writerMapper);
}
protected MetadataProvider createMetadataProvider() throws IOException {
! String basedir = System.getProperty("xdoclet.web.home");
! assertNotNull(basedir);
! File testAppDir = new File(basedir,
"../testapp-web/src/main/java/org/xdoclet/testapp/web");
! return new QDoxMetadataProvider(testAppDir);
}
--- 15,29 ----
/**
* @author Grégory Joseph(moins_moins)
*/
public class TaglibPluginTestCase extends AbstractXMLGeneratingPluginTestCase
{
! protected Plugin createPlugin(MetadataProvider provider, WriterMapper
mapper) throws Exception {
! TaglibPlugin plugin = new TaglibPlugin(new JellyTemplateEngine(),
(QDoxCapableMetadataProvider) provider, mapper);
! plugin.setValidate(false); //Skip validation because of invalid order
of generated tags
! 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"));
}
***************
*** 39,42 ****
return
getResourceRelativeToThisPackage("../../testapp/web/expected/taglib.tld");
}
-
}
--- 31,33 ----
Index: WebPluginTestCase.java
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web/src/test/java/org/xdoclet/plugin/web/WebPluginTestCase.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** WebPluginTestCase.java 13 Nov 2004 09:27:07 -0000 1.10
--- WebPluginTestCase.java 31 May 2005 11:26:43 -0000 1.11
***************
*** 16,20 ****
* @author <a href="mailto:[EMAIL PROTECTED]">Gr�gory Joseph</a>
* @author Aslak Hellesøy
- * @version $Revision$
*/
public class WebPluginTestCase extends AbstractXMLGeneratingPluginTestCase {
--- 16,19 ----
***************
*** 24,30 ****
super.setUp();
servletVersion = "2.3"; // make sure it's reset to 2.3 for every
test, even if a specific test changes the version number
-
- registerDtd(WebPlugin.PUBLIC_ID_2_2,
getResourceURLRelativeToThisPackage("web-app_2_2.dtd"));
- registerDtd(WebPlugin.PUBLIC_ID_2_3,
getResourceURLRelativeToThisPackage("web-app_2_3.dtd"));
}
--- 23,26 ----
***************
*** 34,41 ****
protected MetadataProvider createMetadataProvider() throws IOException {
! String basedir = System.getProperty("xdoclet.web.home");
! assertNotNull(basedir);
! File testAppDir = new File(basedir,
"../testapp-web/src/main/java/org/xdoclet/testapp/web");
! return new QDoxMetadataProvider(testAppDir);
}
--- 30,35 ----
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"));
}
-------------------------------------------------------
This SF.Net email is sponsored by Yahoo.
Introducing Yahoo! Search Developer Network - Create apps using Yahoo!
Search APIs Find out how you can build Yahoo! directly into your own
Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005
_______________________________________________
xdoclet-plugins-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xdoclet-plugins-commits
