Update of
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15840/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate
Modified Files:
AbstractHibernateConfigTestCase.java
AbstractHibernateTestCase.java CompositeIdTestCase.java
InnerCompositeIdTestCase.java InterfaceSubclassTestCase.java
SubclassTestCase.java WithNameTestCase.java
Log Message:
Get rid of ugly "xdoclet.hibernate.home" system variable.
Remove H2 dependency - replace with own DTD resolver.
Index: InnerCompositeIdTestCase.java
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/InnerCompositeIdTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** InnerCompositeIdTestCase.java 20 Apr 2005 03:35:06 -0000 1.1
--- InnerCompositeIdTestCase.java 21 Apr 2005 15:44:01 -0000 1.2
***************
*** 14,18 ****
public class InnerCompositeIdTestCase extends
AbstractHibernateMappingTestCase {
-
protected URL getExpected() throws IOException {
return
getResourceRelativeToThisPackage("compositeId/InnerCompositeIdBean.hbm.xml");
--- 14,17 ----
***************
*** 20,27 ****
protected MetadataProvider createMetadataProvider() throws IOException {
! String basedir = System.getProperty("xdoclet.hibernate.home");
! assertNotNull(basedir);
! return new QDoxMetadataProvider(new File(basedir,
!
"target/test-classes/org/xdoclet/plugin/hibernate/compositeId/inner_pk_class"));
}
}
--- 19,24 ----
protected MetadataProvider createMetadataProvider() throws IOException {
! URL reader =
getResourceRelativeToThisPackage("compositeId/inner_pk_class");
! return new QDoxMetadataProvider(new File(reader.getPath()));
}
}
Index: AbstractHibernateTestCase.java
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/AbstractHibernateTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AbstractHibernateTestCase.java 20 Feb 2005 17:29:54 -0000 1.1
--- AbstractHibernateTestCase.java 21 Apr 2005 15:44:01 -0000 1.2
***************
*** 7,14 ****
package org.xdoclet.plugin.hibernate;
- import net.sf.hibernate.util.DTDEntityResolver;
-
import org.custommonkey.xmlunit.XMLUnit;
import org.generama.tests.AbstractXMLGeneratingPluginTestCase;
import org.xml.sax.EntityResolver;
--- 7,13 ----
package org.xdoclet.plugin.hibernate;
import org.custommonkey.xmlunit.XMLUnit;
import org.generama.tests.AbstractXMLGeneratingPluginTestCase;
+ import org.xdoclet.plugin.hibernate.dtd.DTDEntityResolver;
import org.xml.sax.EntityResolver;
Index: SubclassTestCase.java
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/SubclassTestCase.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** SubclassTestCase.java 28 Jan 2005 19:22:07 -0000 1.7
--- SubclassTestCase.java 21 Apr 2005 15:44:01 -0000 1.8
***************
*** 17,26 ****
return getResourceRelativeToThisPackage("subclass/Root.hbm.xml");
}
!
! protected MetadataProvider createMetadataProvider() throws IOException {
! String basedir = System.getProperty("xdoclet.hibernate.home");
! assertNotNull(basedir);
! return new QDoxMetadataProvider(new File(basedir,
"target/test-classes/org/xdoclet/plugin/hibernate/subclass"));
! }
!
! }
--- 17,23 ----
return getResourceRelativeToThisPackage("subclass/Root.hbm.xml");
}
! protected MetadataProvider createMetadataProvider() throws IOException {
! URL reader = getResourceRelativeToThisPackage("subclass");
! return new QDoxMetadataProvider(new File(reader.getPath()));
! }
! }
Index: WithNameTestCase.java
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/WithNameTestCase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** WithNameTestCase.java 28 Jan 2005 19:22:07 -0000 1.3
--- WithNameTestCase.java 21 Apr 2005 15:44:01 -0000 1.4
***************
*** 19,26 ****
}
! protected MetadataProvider createMetadataProvider() throws IOException {
! String basedir = System.getProperty("xdoclet.hibernate.home");
! assertNotNull(basedir);
! return new QDoxMetadataProvider(new File(basedir,
"target/test-classes/org/xdoclet/plugin/hibernate/withname"));
! }
}
\ No newline at end of file
--- 19,25 ----
}
! protected MetadataProvider createMetadataProvider() throws IOException {
! URL reader = getResourceRelativeToThisPackage("withname");
! return new QDoxMetadataProvider(new File(reader.getPath()));
! }
}
\ No newline at end of file
Index: CompositeIdTestCase.java
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/CompositeIdTestCase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CompositeIdTestCase.java 20 Apr 2005 03:35:06 -0000 1.3
--- CompositeIdTestCase.java 21 Apr 2005 15:44:01 -0000 1.4
***************
*** 10,27 ****
import java.net.URL;
! public class CompositeIdTestCase
! extends AbstractHibernateMappingTestCase {
protected URL getExpected() throws IOException {
return
getResourceRelativeToThisPackage("compositeId/CompositeIdBean.hbm.xml");
}
! protected MetadataProvider createMetadataProvider()
! throws IOException {
! String basedir = System.getProperty("xdoclet.hibernate.home");
!
! assertNotNull(basedir);
!
! return new QDoxMetadataProvider(new File(basedir,
!
"target/test-classes/org/xdoclet/plugin/hibernate/compositeId/separated_pk_class"));
}
}
\ No newline at end of file
--- 10,21 ----
import java.net.URL;
! public class CompositeIdTestCase extends AbstractHibernateMappingTestCase {
protected URL getExpected() throws IOException {
return
getResourceRelativeToThisPackage("compositeId/CompositeIdBean.hbm.xml");
}
! protected MetadataProvider createMetadataProvider() throws IOException {
! URL reader =
getResourceRelativeToThisPackage("compositeId/separated_pk_class");
! return new QDoxMetadataProvider(new File(reader.getPath()));
}
}
\ No newline at end of file
Index: AbstractHibernateConfigTestCase.java
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/AbstractHibernateConfigTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AbstractHibernateConfigTestCase.java 20 Feb 2005 17:29:54 -0000
1.1
--- AbstractHibernateConfigTestCase.java 21 Apr 2005 15:44:00 -0000
1.2
***************
*** 1,29 ****
! /*
! * Copyright (c) 2003
! * XDoclet Team
! * All rights reserved.
! */
! package org.xdoclet.plugin.hibernate;
!
! import java.io.File;
! import java.io.IOException;
!
! import org.generama.MetadataProvider;
! import org.xdoclet.QDoxMetadataProvider;
!
! /**
! * Abstract test case for all hibernate mapping testing. We create plugin
here, and also
! * setup entity resolver for xmlunit parsers. We take entity resolver from
hibernate,
! * so we can always be sure that we got correct DTD.
! *
! * @author Konstantin Pribluda ( ko5tik(at)codehaus(dot)org )
! */
! public abstract class AbstractHibernateConfigTestCase extends
AbstractHibernateTestCase {
!
!
! protected MetadataProvider createMetadataProvider() throws IOException {
! String basedir = System.getProperty("xdoclet.hibernate.home");
! assertNotNull(basedir);
! return new QDoxMetadataProvider(new File(basedir,
"target/test-classes/org/xdoclet/plugin/hibernate/subclass"));
! }
! }
--- 1,27 ----
! /*
! * Copyright (c) 2003
! * XDoclet Team
! * All rights reserved.
! */
! package org.xdoclet.plugin.hibernate;
!
! import java.io.File;
! import java.io.IOException;
! import java.net.URL;
!
! import org.generama.MetadataProvider;
! import org.xdoclet.QDoxMetadataProvider;
!
! /**
! * Abstract test case for all hibernate mapping testing. We create plugin
here, and also
! * setup entity resolver for xmlunit parsers. We take entity resolver from
hibernate,
! * so we can always be sure that we got correct DTD.
! *
! * @author Konstantin Pribluda ( ko5tik(at)codehaus(dot)org )
! */
! public abstract class AbstractHibernateConfigTestCase extends
AbstractHibernateTestCase {
! protected MetadataProvider createMetadataProvider() throws IOException {
! URL reader = getResourceRelativeToThisPackage("subclass");
! return new QDoxMetadataProvider(new File(reader.getPath()));
! }
! }
Index: InterfaceSubclassTestCase.java
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/InterfaceSubclassTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** InterfaceSubclassTestCase.java 13 Dec 2004 16:29:22 -0000 1.1
--- InterfaceSubclassTestCase.java 21 Apr 2005 15:44:01 -0000 1.2
***************
*** 19,26 ****
protected MetadataProvider createMetadataProvider() throws IOException {
! String basedir = System.getProperty("xdoclet.hibernate.home");
! assertNotNull(basedir);
! return new QDoxMetadataProvider(new File(basedir,
"target/test-classes/org/xdoclet/plugin/hibernate/intf"));
}
-
}
--- 19,24 ----
protected MetadataProvider createMetadataProvider() throws IOException {
! URL reader = getResourceRelativeToThisPackage("intf");
! return new QDoxMetadataProvider(new File(reader.getPath()));
}
}
-------------------------------------------------------
This SF.Net email is sponsored by: New Crystal Reports XI.
Version 11 adds new functionality designed to reduce time involved in
creating, integrating, and deploying reporting solutions. Free runtime info,
new features, or free trial, at: http://www.businessobjects.com/devxi/728
_______________________________________________
xdoclet-plugins-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xdoclet-plugins-commits
