Update of
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-struts/src/test/java/org/xdoclet/plugin/struts
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19407/src/test/java/org/xdoclet/plugin/struts
Modified Files:
AbstractStrutsConfigTestCase.java
AbstractStrutsValidationTestCase.java StrutsConfigTest.java
StrutsValidationTest.java
Log Message:
Moving to generama 1.1.1-SNAPSHOT
Index: AbstractStrutsValidationTestCase.java
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-struts/src/test/java/org/xdoclet/plugin/struts/AbstractStrutsValidationTestCase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AbstractStrutsValidationTestCase.java 26 Apr 2005 07:23:32 -0000
1.3
--- AbstractStrutsValidationTestCase.java 31 May 2005 11:26:16 -0000
1.4
***************
*** 1 ****
! /*
* Copyright (c) 2004
* XDoclet Team
* All rights reserved.
*/
package org.xdoclet.plugin.struts;
import org.custommonkey.xmlunit.XMLUnit;
import org.generama.JellyTemplateEngine;
import org.generama.MetadataProvider;
import org.generama.Plugin;
import org.generama.QDoxCapableMetadataProvider;
import org.generama.WriterMapper;
import org.generama.tests.AbstractXMLGeneratingPluginTestCase;
/**
* @author Alexandre Martins
*/
public abstract class AbstractStrutsValidationTestCase extends
AbstractXMLGeneratingPluginTestCase {
protected void setUp() throws Exception {
super.setUp();
XMLUnit.getControlDocumentBuilderFactory().setValidating(true);
XMLUnit.getTestDocumentBuilderFactory().setValidating(true);
}
protected Plugin createPlugin(MetadataProvider metadataProvider,
WriterMapper writerMapper) {
return new StrutsValidationXMLPlugin(new JellyTemplateEngine(),
(QDoxCapableMetadataProvider) metadataProvider, writerMapper);
}
}
--- 1,23 ----
! /*
! * Copyright (c) 2004
! * XDoclet Team
! * All rights reserved.
! */
! package org.xdoclet.plugin.struts;
!
! import org.custommonkey.xmlunit.XMLUnit;
! import org.generama.JellyTemplateEngine;
! import org.generama.MetadataProvider;
! import org.generama.Plugin;
! import org.generama.QDoxCapableMetadataProvider;
! import org.generama.WriterMapper;
! import org.generama.tests.AbstractXMLGeneratingPluginTestCase;
!
! /**
! * @author Alexandre Martins
! */
! public abstract class AbstractStrutsValidationTestCase extends
AbstractXMLGeneratingPluginTestCase {
! protected Plugin createPlugin(MetadataProvider metadataProvider,
WriterMapper writerMapper) {
! return new StrutsValidationXMLPlugin(new JellyTemplateEngine(),
(QDoxCapableMetadataProvider) metadataProvider, writerMapper);
! }
! }
Index: StrutsValidationTest.java
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-struts/src/test/java/org/xdoclet/plugin/struts/StrutsValidationTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** StrutsValidationTest.java 24 Jan 2005 04:32:48 -0000 1.3
--- StrutsValidationTest.java 31 May 2005 11:26:16 -0000 1.4
***************
*** 18,27 ****
*/
public class StrutsValidationTest extends AbstractStrutsValidationTestCase {
-
protected MetadataProvider createMetadataProvider() throws Exception {
! String basedir = System.getProperty("xdoclet.struts.home");
! assertNotNull(basedir);
! System.err.println(new File(basedir,
"../plugin-struts/src/test/java/org/xdoclet/plugin/struts/complete"));
! return new QDoxMetadataProvider(new File(basedir,
"../plugin-struts/src/test/java/org/xdoclet/plugin/struts/complete"));
}
--- 18,24 ----
*/
public class StrutsValidationTest extends AbstractStrutsValidationTestCase {
protected MetadataProvider createMetadataProvider() throws Exception {
! URL reader = getResourceRelativeToThisPackage("complete");
! return new QDoxMetadataProvider(new File(reader.getPath()));
}
***************
*** 29,38 ****
return
this.getResourceRelativeToThisPackage("complete/validation.xml");
}
-
- protected Plugin createPlugin(MetadataProvider metadataProvider,
WriterMapper writerMapper) {
- StrutsValidationXMLPlugin plugin = (StrutsValidationXMLPlugin)
super.createPlugin(metadataProvider, writerMapper);
- String basedir = System.getProperty("xdoclet.struts.home");
- assertNotNull(basedir);
- return plugin;
- }
}
--- 26,28 ----
Index: AbstractStrutsConfigTestCase.java
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-struts/src/test/java/org/xdoclet/plugin/struts/AbstractStrutsConfigTestCase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AbstractStrutsConfigTestCase.java 26 Apr 2005 07:23:32 -0000 1.3
--- AbstractStrutsConfigTestCase.java 31 May 2005 11:26:16 -0000 1.4
***************
*** 1 ****
! /*
* Copyright (c) 2004
* XDoclet Team
* All rights reserved.
*/
package org.xdoclet.plugin.struts;
import org.custommonkey.xmlunit.XMLUnit;
import org.generama.JellyTemplateEngine;
import org.generama.MetadataProvider;
import org.generama.Plugin;
import org.generama.QDoxCapableMetadataProvider;
import org.generama.WriterMapper;
import org.generama.tests.AbstractXMLGeneratingPluginTestCase;
/**
* @author Alexandre Martins
*/
public abstract class AbstractStrutsConfigTestCase extends
AbstractXMLGeneratingPluginTestCase {
protected void setUp() throws Exception {
super.setUp();
XMLUnit.getControlDocumentBuilderFactory().setValidating(true);
XMLUnit.getTestDocumentBuilderFactory().setValidating(true);
}
protected Plugin createPlugin(MetadataProvider metadataProvider,
WriterMapper writerMapper) {
return new StrutsConfigXMLPlugin(new JellyTemplateEngine(),
(QDoxCapableMetadataProvider) metadataProvider, writerMapper);
}
}
--- 1,23 ----
! /*
! * Copyright (c) 2004
! * XDoclet Team
! * All rights reserved.
! */
! package org.xdoclet.plugin.struts;
!
! import org.custommonkey.xmlunit.XMLUnit;
! import org.generama.JellyTemplateEngine;
! import org.generama.MetadataProvider;
! import org.generama.Plugin;
! import org.generama.QDoxCapableMetadataProvider;
! import org.generama.WriterMapper;
! import org.generama.tests.AbstractXMLGeneratingPluginTestCase;
!
! /**
! * @author Alexandre Martins
! */
! public abstract class AbstractStrutsConfigTestCase extends
AbstractXMLGeneratingPluginTestCase {
! protected Plugin createPlugin(MetadataProvider provider, WriterMapper
mapper) {
! return new StrutsConfigXMLPlugin(new JellyTemplateEngine(),
(QDoxCapableMetadataProvider) provider, mapper);
! }
! }
Index: StrutsConfigTest.java
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-struts/src/test/java/org/xdoclet/plugin/struts/StrutsConfigTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** StrutsConfigTest.java 3 Feb 2005 22:17:21 -0000 1.3
--- StrutsConfigTest.java 31 May 2005 11:26:16 -0000 1.4
***************
*** 6,11 ****
package org.xdoclet.plugin.struts;
- import java.io.File;
- import java.net.URL;
import org.generama.MetadataProvider;
import org.generama.Plugin;
--- 6,9 ----
***************
*** 13,26 ****
import org.xdoclet.QDoxMetadataProvider;
/**
* @author Alexandre Martins
*/
public class StrutsConfigTest extends AbstractStrutsConfigTestCase {
-
protected MetadataProvider createMetadataProvider() throws Exception {
! String basedir = System.getProperty("xdoclet.struts.home");
! assertNotNull(basedir);
! // System.err.println(new File(basedir,
"../plugin-struts/src/test/java/org/xdoclet/plugin/struts/complete"));
! return new QDoxMetadataProvider(new File(basedir,
"../plugin-struts/src/test/java/org/xdoclet/plugin/struts/complete"));
}
--- 11,24 ----
import org.xdoclet.QDoxMetadataProvider;
+ import java.io.File;
+ import java.net.URL;
+
/**
* @author Alexandre Martins
*/
public class StrutsConfigTest extends AbstractStrutsConfigTestCase {
protected MetadataProvider createMetadataProvider() throws Exception {
! URL reader = getResourceRelativeToThisPackage("complete");
! return new QDoxMetadataProvider(new File(reader.getPath()));
}
***************
*** 31,37 ****
protected Plugin createPlugin(MetadataProvider metadataProvider,
WriterMapper writerMapper) {
StrutsConfigXMLPlugin plugin = (StrutsConfigXMLPlugin)
super.createPlugin(metadataProvider, writerMapper);
! String basedir = System.getProperty("xdoclet.struts.home");
! assertNotNull(basedir);
! plugin.setMergedir(new File(basedir,
"src/test/java/org/xdoclet/plugin/struts/complete/merge"));
return plugin;
}
--- 29,35 ----
protected Plugin createPlugin(MetadataProvider metadataProvider,
WriterMapper writerMapper) {
StrutsConfigXMLPlugin plugin = (StrutsConfigXMLPlugin)
super.createPlugin(metadataProvider, writerMapper);
! URL completeDirURL = getResourceRelativeToThisPackage("complete");
! plugin.setMergedir(new File(completeDirURL.getPath(), "merge"));
! plugin.setValidate(false); // due to complete/struts-config.xml is
not valid
return plugin;
}
-------------------------------------------------------
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
