[hibernate-commits] Hibernate SVN: r11404 - in branches/Branch_3_2/HibernateExt/tools: lib and 21 other directories.
hibernate-commits at lists.jboss.org
hibernate-commits at lists.jboss.org
Fri Apr 13 10:29:43 EDT 2007
Author: max.andersen at jboss.com
Date: 2007-04-13 10:29:43 -0400 (Fri, 13 Apr 2007)
New Revision: 11404
Added:
branches/Branch_3_2/HibernateExt/tools/lib/testlibs/commons-collections-2.1.1.jar
branches/Branch_3_2/HibernateExt/tools/lib/testlibs/dom4j-1.6.1.jar
branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/ReverseEngineeringRuntimeInfo.java
branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/dialect/MySQLMetaDataDialect.java
branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/ant/CoreTaskTest.java
branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/MySQLAutoIncrementTest.java
branches/Branch_3_2/HibernateExt/tools/src/testsupport/coretest-build.xml
branches/Branch_3_2/HibernateExt/tools/testdb/
Modified:
branches/Branch_3_2/HibernateExt/tools/changelog.txt
branches/Branch_3_2/HibernateExt/tools/lib/freemarker.jar
branches/Branch_3_2/HibernateExt/tools/lib/testlibs/ejb3-persistence.jar
branches/Branch_3_2/HibernateExt/tools/lib/testlibs/hibernate-annotations.jar
branches/Branch_3_2/HibernateExt/tools/lib/testlibs/hibernate-entitymanager.jar
branches/Branch_3_2/HibernateExt/tools/lib/testlibs/hibernate3.jar
branches/Branch_3_2/HibernateExt/tools/lib/testlibs/jboss-archive-browsing.jar
branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/JDBCBinder.java
branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/DatabaseCollector.java
branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/DefaultReverseEngineeringStrategy.java
branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/DelegatingReverseEngineeringStrategy.java
branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/JDBCReader.java
branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/OverrideRepository.java
branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/ReverseEngineeringStrategy.java
branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/TableFilter.java
branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/dialect/AbstractMetaDataDialect.java
branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/dialect/CachedMetaDataDialect.java
branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/dialect/JDBCMetaDataDialect.java
branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/dialect/MetaDataDialect.java
branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/dialect/OracleMetaDataDialect.java
branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/ant/HibernateToolTask.java
branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/ant/JDBCConfigurationTask.java
branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/ant/JPAConfigurationTask.java
branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/ant/JavaFormatterTask.java
branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/Cfg2HbmTool.java
branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/DAONewExporter.java
branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/MetaAttributeHelper.java
branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/StringUtils.java
branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/TemplateHelper.java
branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/TemplateProducer.java
branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/doc/DocFile.java
branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/doc/DocFileManager.java
branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/doc/DocHelper.java
branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/pojo/AnnotationBuilder.java
branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/seam/SeamExporter.java
branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbmlint/Detector.java
branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbmlint/detector/SchemaByMetaDataDetector.java
branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/stat/AbstractTreeModel.java
branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/stat/BeanTableModel.java
branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/stat/StatisticsCellRenderer.java
branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/stat/StatisticsTreeModel.java
branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/BaseTestCase.java
branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/JDBCMetaDataBinderTestCase.java
branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/NonReflectiveTestCase.java
branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/ant/AntHibernateToolTest.java
branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/ant/BuildFileTestCase.java
branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/ant/JavaFormatterTest.java
branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/CachedMetaDataTest.java
branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/DefaultSchemaCatalogTest.java
branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/Hbm2JavaEjb3Test.java
branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/Hbm2JavaTest.java
branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/IncrementalSchemaReadingTest.java
branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/Hbm2HbmXmlTest.java
branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/InheritanceTest.java
branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/hbmlint/HbmLintTest.java
branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/hbmlint/SchemaAnalyzerTest.java
branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/ide/completion/HqlAnalyzerTest.java
branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/ide/completion/ModelCompletionTest.java
branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/test/TestHelper.java
branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/CompositeIdTest.java
branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/ForeignKeysTest.java
branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/KeyPropertyCompositeIdTest.java
branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/ManyToManyTest.java
branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/OracleCompositeIdOrderTest.java
branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/OracleViewsTest.java
branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/OverrideBinderTest.java
branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/PersistentClassesTest.java
branches/Branch_3_2/HibernateExt/tools/src/testsupport/NoopReverseEngineeringStrategy.java
branches/Branch_3_2/HibernateExt/tools/src/testsupport/anttest-build.xml
Log:
initial autoincrement detection
updated testlibs to be compatible
and imports and other cleanup
Modified: branches/Branch_3_2/HibernateExt/tools/changelog.txt
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/changelog.txt 2007-04-11 14:25:13 UTC (rev 11403)
+++ branches/Branch_3_2/HibernateExt/tools/changelog.txt 2007-04-13 14:29:43 UTC (rev 11404)
@@ -1,6 +1,9 @@
Hibernate Tools Changelog
=========================
+Changes in version 3.2beta9
+---------------------------
+
Changes in version 3.2alpha7
----------------------------
Modified: branches/Branch_3_2/HibernateExt/tools/lib/freemarker.jar
===================================================================
(Binary files differ)
Added: branches/Branch_3_2/HibernateExt/tools/lib/testlibs/commons-collections-2.1.1.jar
===================================================================
(Binary files differ)
Property changes on: branches/Branch_3_2/HibernateExt/tools/lib/testlibs/commons-collections-2.1.1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/Branch_3_2/HibernateExt/tools/lib/testlibs/dom4j-1.6.1.jar
===================================================================
(Binary files differ)
Property changes on: branches/Branch_3_2/HibernateExt/tools/lib/testlibs/dom4j-1.6.1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: branches/Branch_3_2/HibernateExt/tools/lib/testlibs/ejb3-persistence.jar
===================================================================
(Binary files differ)
Modified: branches/Branch_3_2/HibernateExt/tools/lib/testlibs/hibernate-annotations.jar
===================================================================
(Binary files differ)
Modified: branches/Branch_3_2/HibernateExt/tools/lib/testlibs/hibernate-entitymanager.jar
===================================================================
(Binary files differ)
Modified: branches/Branch_3_2/HibernateExt/tools/lib/testlibs/hibernate3.jar
===================================================================
(Binary files differ)
Modified: branches/Branch_3_2/HibernateExt/tools/lib/testlibs/jboss-archive-browsing.jar
===================================================================
(Binary files differ)
Modified: branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/JDBCBinder.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/JDBCBinder.java 2007-04-11 14:25:13 UTC (rev 11403)
+++ branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/JDBCBinder.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -41,7 +41,6 @@
import org.hibernate.mapping.PersistentClass;
import org.hibernate.mapping.Property;
import org.hibernate.mapping.RootClass;
-import org.hibernate.mapping.Selectable;
import org.hibernate.mapping.SimpleValue;
import org.hibernate.mapping.Table;
import org.hibernate.mapping.Value;
Modified: branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/DatabaseCollector.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/DatabaseCollector.java 2007-04-11 14:25:13 UTC (rev 11403)
+++ branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/DatabaseCollector.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -17,4 +17,6 @@
public abstract Map getOneToManyCandidates();
+ //TODO: add identifier strategy suggestions here ?
+
}
\ No newline at end of file
Modified: branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/DefaultReverseEngineeringStrategy.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/DefaultReverseEngineeringStrategy.java 2007-04-11 14:25:13 UTC (rev 11403)
+++ branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/DefaultReverseEngineeringStrategy.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -12,8 +12,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.hibernate.connection.ConnectionProvider;
-import org.hibernate.exception.SQLExceptionConverter;
import org.hibernate.mapping.Column;
import org.hibernate.mapping.ForeignKey;
import org.hibernate.mapping.Table;
@@ -26,6 +24,8 @@
private static Set AUTO_OPTIMISTICLOCK_COLUMNS;
private ReverseEngineeringSettings settings = new ReverseEngineeringSettings(this);
+
+ private ReverseEngineeringRuntimeInfo runtimeInfo;
static {
AUTO_OPTIMISTICLOCK_COLUMNS = new HashSet();
AUTO_OPTIMISTICLOCK_COLUMNS.add("version");
@@ -144,7 +144,21 @@
}
public String getTableIdentifierStrategyName(TableIdentifier identifier) {
- return "assigned";
+ String suggestion = null;
+ if(runtimeInfo!=null) {
+ Iterator iterator = runtimeInfo.getMetadataDialect().getSuggestedPrimaryKeyStrategyName(identifier.getCatalog(), identifier.getSchema(), identifier.getName());
+ if(iterator.hasNext()) {
+ Map m = (Map) iterator.next();
+ suggestion = (String) m.get( "HIBERNATE_STRATEGY" );
+ }
+ runtimeInfo.getMetadataDialect().close(iterator);
+ }
+
+ if(StringHelper.isEmpty( suggestion )) {
+ return "assigned";
+ } else {
+ return suggestion;
+ }
}
public Properties getTableIdentifierProperties(TableIdentifier identifier) {
@@ -159,12 +173,12 @@
return className + "Id";
}
- public void configure(ConnectionProvider provider, SQLExceptionConverter sec) {
- // noop
+ public void configure(ReverseEngineeringRuntimeInfo rti) {
+ this.runtimeInfo = rti;
}
public void close() {
- // noop
+ runtimeInfo = null;
}
/** Return explicit which column name should be used for optimistic lock */
Modified: branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/DelegatingReverseEngineeringStrategy.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/DelegatingReverseEngineeringStrategy.java 2007-04-11 14:25:13 UTC (rev 11403)
+++ branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/DelegatingReverseEngineeringStrategy.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -4,8 +4,6 @@
import java.util.Map;
import java.util.Properties;
-import org.hibernate.connection.ConnectionProvider;
-import org.hibernate.exception.SQLExceptionConverter;
import org.hibernate.mapping.ForeignKey;
import org.hibernate.mapping.Table;
@@ -65,8 +63,8 @@
return delegate==null?null:delegate.classNameToCompositeIdName(className);
}
- public void configure(ConnectionProvider provider, SQLExceptionConverter sec) {
- if(delegate!=null) delegate.configure(provider,sec);
+ public void configure(ReverseEngineeringRuntimeInfo runtimeInfo) {
+ if(delegate!=null) delegate.configure(runtimeInfo);
}
public void close() {
@@ -134,6 +132,6 @@
public Map columnToMetaAttributes(TableIdentifier identifier, String column) {
return delegate==null?null:delegate.columnToMetaAttributes( identifier, column );
- }
+ }
}
Modified: branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/JDBCReader.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/JDBCReader.java 2007-04-11 14:25:13 UTC (rev 11403)
+++ branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/JDBCReader.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -23,7 +23,6 @@
import org.hibernate.cfg.JDBCBinderException;
import org.hibernate.cfg.reveng.dialect.MetaDataDialect;
import org.hibernate.connection.ConnectionProvider;
-import org.hibernate.dialect.Dialect;
import org.hibernate.exception.SQLExceptionConverter;
import org.hibernate.mapping.Column;
import org.hibernate.mapping.ForeignKey;
@@ -64,7 +63,7 @@
public List readDatabaseSchema(DatabaseCollector dbs, String catalog, String schema, ProgressListener progress) {
try {
getMetaDataDialect().configure(provider, sec);
- revengStrategy.configure(provider, sec);
+ revengStrategy.configure(new ReverseEngineeringRuntimeInfo(provider, sec, metadataDialect));
Set hasIndices = new HashSet();
@@ -190,7 +189,7 @@
String fkSchema = getSchemaForModel((String) exportedKeyRs.get("FKTABLE_SCHEM"));
String fkTableName = (String) exportedKeyRs.get("FKTABLE_NAME");
String fkColumnName = (String) exportedKeyRs.get("FKCOLUMN_NAME");
- String pkColumnName = (String) exportedKeyRs.get("PKCOLUMN_NAME");
+ //String pkColumnName = (String) exportedKeyRs.get("PKCOLUMN_NAME");
String fkName = (String) exportedKeyRs.get("FK_NAME");
short keySeq = ((Short)exportedKeyRs.get("KEY_SEQ")).shortValue();
@@ -553,7 +552,7 @@
columnRs = (Map) columnIterator.next();
String tableName = (String) columnRs.get("TABLE_NAME");
int sqlType = ((Integer)columnRs.get("DATA_TYPE")).intValue();
- String sqlTypeName = (String) columnRs.get("TYPE_NAME");
+ //String sqlTypeName = (String) columnRs.get("TYPE_NAME");
String columnName = (String) columnRs.get("COLUMN_NAME");
Modified: branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/OverrideRepository.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/OverrideRepository.java 2007-04-11 14:25:13 UTC (rev 11403)
+++ branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/OverrideRepository.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -21,6 +21,7 @@
import org.dom4j.Document;
import org.hibernate.MappingException;
import org.hibernate.mapping.ForeignKey;
+import org.hibernate.mapping.MetaAttribute;
import org.hibernate.mapping.Table;
import org.hibernate.util.StringHelper;
import org.hibernate.util.XMLHelper;
@@ -271,7 +272,7 @@
tableFilters.add(filter);
}
- public ReverseEngineeringStrategy getReverseEngineeringStrategy(ReverseEngineeringStrategy delegate) {
+ public ReverseEngineeringStrategy getReverseEngineeringStrategy(ReverseEngineeringStrategy delegate) {
return new DelegatingReverseEngineeringStrategy(delegate) {
public boolean excludeTable(TableIdentifier ti) {
Added: branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/ReverseEngineeringRuntimeInfo.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/ReverseEngineeringRuntimeInfo.java (rev 0)
+++ branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/ReverseEngineeringRuntimeInfo.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -0,0 +1,38 @@
+package org.hibernate.cfg.reveng;
+
+import org.hibernate.cfg.reveng.dialect.MetaDataDialect;
+import org.hibernate.connection.ConnectionProvider;
+import org.hibernate.exception.SQLExceptionConverter;
+
+/**
+ * Provides runtime-only information for reverse engineering process.
+ * e.g. current connection provider, exception converter etc.
+ *
+ * @author max
+ *
+ */
+public class ReverseEngineeringRuntimeInfo {
+
+ private final ConnectionProvider connectionProvider;
+ private final SQLExceptionConverter SQLExceptionConverter;
+ private final MetaDataDialect metadataDialect;
+
+ protected ReverseEngineeringRuntimeInfo(ConnectionProvider provider, SQLExceptionConverter sec, MetaDataDialect metadataDialect) {
+ this.connectionProvider = provider;
+ this.SQLExceptionConverter = sec;
+ this.metadataDialect = metadataDialect;
+ }
+
+ public ConnectionProvider getConnectionProvider() {
+ return connectionProvider;
+ }
+
+ public SQLExceptionConverter getSQLExceptionConverter() {
+ return SQLExceptionConverter;
+ }
+
+ public MetaDataDialect getMetadataDialect() {
+ return metadataDialect;
+ }
+
+}
Modified: branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/ReverseEngineeringStrategy.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/ReverseEngineeringStrategy.java 2007-04-11 14:25:13 UTC (rev 11403)
+++ branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/ReverseEngineeringStrategy.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -4,8 +4,7 @@
import java.util.Map;
import java.util.Properties;
-import org.hibernate.connection.ConnectionProvider;
-import org.hibernate.exception.SQLExceptionConverter;
+import org.hibernate.cfg.reveng.dialect.MetaDataDialect;
import org.hibernate.mapping.ForeignKey;
import org.hibernate.mapping.MetaAttribute;
import org.hibernate.mapping.Table;
@@ -22,12 +21,11 @@
/**
* Configure the reverse engineering strategy. Called before reverse engineering commences.
*
- * This is mainly for exotic strategies to get access to a connection.
+ * This is mainly for exotic strategies to get access to a connection.
*
- * @param provider a connectionprovider. It is the responsibility of the metadatadialect to open/close any used connections via this provider.
- * @param sec sqlexceptionConverter, use to convert any possible SQLExceptions.
+ * @param runtimeInfo
*/
- public void configure(ConnectionProvider provider, SQLExceptionConverter sec);
+ public void configure(ReverseEngineeringRuntimeInfo runtimeInfo);
/**
Modified: branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/TableFilter.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/TableFilter.java 2007-04-11 14:25:13 UTC (rev 11403)
+++ branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/TableFilter.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -50,13 +50,13 @@
}
}
- boolean match(String value) {
+ boolean match(String matchEnum) {
switch (mode) {
case ANY: return true;
- case EQUALS: return this.value.equals(value);
- case ENDSWITH: return value.endsWith(this.value);
- case STARTSWITH: return value.startsWith(this.value);
- case SUBSTRING: return value.indexOf(this.value)>=0;
+ case EQUALS: return this.value.equals(matchEnum);
+ case ENDSWITH: return matchEnum.endsWith(this.value);
+ case STARTSWITH: return matchEnum.startsWith(this.value);
+ case SUBSTRING: return matchEnum.indexOf(this.value)>=0;
default:
throw new IllegalStateException();
}
Modified: branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/dialect/AbstractMetaDataDialect.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/dialect/AbstractMetaDataDialect.java 2007-04-11 14:25:13 UTC (rev 11403)
+++ branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/dialect/AbstractMetaDataDialect.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -4,7 +4,11 @@
import java.sql.DatabaseMetaData;
import java.sql.ResultSet;
import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -165,4 +169,15 @@
}
}
+
+ public Iterator getSuggestedPrimaryKeyStrategyName(String catalog, String schema, String table) {
+ Map m = new HashMap();
+ m.put( "TABLE_CAT", catalog );
+ m.put( "TABLE_SCHEMA", schema );
+ m.put( "TABLE_NAME", table );
+ m.put( "HIBERNATE_STRATEGY", null );
+ List l = new ArrayList();
+ l.add(m);
+ return l.iterator();
+ }
}
Modified: branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/dialect/CachedMetaDataDialect.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/dialect/CachedMetaDataDialect.java 2007-04-11 14:25:13 UTC (rev 11403)
+++ branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/dialect/CachedMetaDataDialect.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -187,5 +187,9 @@
realIterator = null;
}
}
+
+ public Iterator getSuggestedPrimaryKeyStrategyName(String catalog, String schema, String name) {
+ return delegate.getSuggestedPrimaryKeyStrategyName( catalog, schema, name );
+ }
}
Modified: branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/dialect/JDBCMetaDataDialect.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/dialect/JDBCMetaDataDialect.java 2007-04-11 14:25:13 UTC (rev 11403)
+++ branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/dialect/JDBCMetaDataDialect.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -30,11 +30,11 @@
return new ResultSetIterator(tableRs, getSQLExceptionConverter()) {
Map element = new HashMap();
- protected Object convertRow(ResultSet tableRs) throws SQLException {
+ protected Object convertRow(ResultSet tableResultSet) throws SQLException {
element.clear();
- putTablePart( element, tableRs );
- element.put("TABLE_TYPE", tableRs.getString("TABLE_TYPE"));
- element.put("REMARKS", tableRs.getString("REMARKS"));
+ putTablePart( element, tableResultSet );
+ element.put("TABLE_TYPE", tableResultSet.getString("TABLE_TYPE"));
+ element.put("REMARKS", tableResultSet.getString("REMARKS"));
return element;
}
protected Throwable handleSQLException(SQLException e) {
Modified: branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/dialect/MetaDataDialect.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/dialect/MetaDataDialect.java 2007-04-11 14:25:13 UTC (rev 11403)
+++ branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/dialect/MetaDataDialect.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -95,4 +95,14 @@
* Close any resources this dialect might have used.
*/
void close();
+
+ /**
+ * Use database (possible native) metadata to suggest identifier strategy.
+ *
+ * @param catalog
+ * @param schema
+ * @param name
+ * @return iterator with map elements that has "TABLE_NAME", "TABLE_SCHEMA", "TABLE_CAT", "HIBERNATE_STRATEGY" (null if no possible to determine strategy, otherwise return hibernate identifier strategy name/classname)
+ */
+ public Iterator getSuggestedPrimaryKeyStrategyName(String catalog, String schema, String table);
}
Added: branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/dialect/MySQLMetaDataDialect.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/dialect/MySQLMetaDataDialect.java (rev 0)
+++ branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/dialect/MySQLMetaDataDialect.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -0,0 +1,44 @@
+package org.hibernate.cfg.reveng.dialect;
+
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+public class MySQLMetaDataDialect extends JDBCMetaDataDialect {
+
+ public Iterator getSuggestedPrimaryKeyStrategyName(String catalog, String schema, String table) {
+ try {
+ catalog = caseForSearch( catalog );
+ schema = caseForSearch( schema );
+ table = caseForSearch( table );
+
+ log.debug("getTables(" + catalog + "." + schema + "." + table + ")");
+
+ String sql = "show table " + (schema==null?"":" " + schema + " ") + (table==null?"":" '" + table + "' ");
+ PreparedStatement statement = getConnection().prepareStatement( sql );
+
+ return new ResultSetIterator(statement.executeQuery(), getSQLExceptionConverter()) {
+
+ Map element = new HashMap();
+ protected Object convertRow(ResultSet tableRs) throws SQLException {
+ element.clear();
+ putTablePart( element, tableRs );
+ element.put("HIBERNATE_STRATEGY", tableRs.getString("AUTO_INCREMENT"));
+ return element;
+ }
+ protected Throwable handleSQLException(SQLException e) {
+ // schemaRs and catalogRs are only used for error reporting if
+ // we get an exception
+ throw getSQLExceptionConverter().convert( e,
+ "Could not get list of suggested identity strategies from database. Probably a JDBC driver problem. ", null );
+ }
+ };
+ } catch (SQLException e) {
+ throw getSQLExceptionConverter().convert(e, "Could not get list of tables from database. Probably a JDBC driver problem.", null);
+ }
+ }
+ }
+
Modified: branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/dialect/OracleMetaDataDialect.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/dialect/OracleMetaDataDialect.java 2007-04-11 14:25:13 UTC (rev 11403)
+++ branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/dialect/OracleMetaDataDialect.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -226,14 +226,14 @@
Map element = new HashMap();
- protected Object convertRow(ResultSet tableRs)
+ protected Object convertRow(ResultSet tableResultSet)
throws SQLException {
element.clear();
- element.put("TABLE_NAME", tableRs.getString(1));
- element.put("TABLE_SCHEM", tableRs.getString(2));
+ element.put("TABLE_NAME", tableResultSet.getString(1));
+ element.put("TABLE_SCHEM", tableResultSet.getString(2));
element.put("TABLE_CAT", null);
- element.put("TABLE_TYPE", tableRs.getString(4));
- element.put("REMARKS", tableRs.getString(3));
+ element.put("TABLE_TYPE", tableResultSet.getString(4));
+ element.put("REMARKS", tableResultSet.getString(3));
log.info( element );
return element;
}
Modified: branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/ant/HibernateToolTask.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/ant/HibernateToolTask.java 2007-04-11 14:25:13 UTC (rev 11403)
+++ branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/ant/HibernateToolTask.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -17,7 +17,6 @@
import org.apache.tools.ant.types.Environment;
import org.apache.tools.ant.types.Path;
import org.apache.tools.ant.types.PropertySet;
-import org.hibernate.MappingException;
import org.hibernate.MappingNotFoundException;
import org.hibernate.cfg.Configuration;
import org.hibernate.util.StringHelper;
@@ -28,6 +27,9 @@
*/
public class HibernateToolTask extends Task {
+ public HibernateToolTask() {
+ super();
+ }
ConfigurationTask configurationTask;
private File destDir;
private List generators = new ArrayList();
@@ -170,13 +172,14 @@
Iterator iterator = generators.iterator();
AntClassLoader loader = getProject().createClassLoader(classPath);
+
ExporterTask generatorTask = null;
int count = 1;
try {
- loader.setParent(this.getClass().getClassLoader() ); // if this is not set, classes from the taskdef cannot be found - which is crucial for e.g. annotations.
+ ClassLoader classLoader = this.getClass().getClassLoader();
+ loader.setParent(classLoader ); // if this is not set, classes from the taskdef cannot be found - which is crucial for e.g. annotations.
loader.setThreadContextLoader();
-
while (iterator.hasNext() ) {
generatorTask = (ExporterTask) iterator.next();
log(count++ + ". task: " + generatorTask.getName() );
Modified: branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/ant/JDBCConfigurationTask.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/ant/JDBCConfigurationTask.java 2007-04-11 14:25:13 UTC (rev 11403)
+++ branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/ant/JDBCConfigurationTask.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -12,7 +12,6 @@
import org.apache.tools.ant.types.Path;
import org.hibernate.cfg.Configuration;
import org.hibernate.cfg.JDBCMetaDataConfiguration;
-import org.hibernate.cfg.Settings;
import org.hibernate.cfg.reveng.DefaultReverseEngineeringStrategy;
import org.hibernate.cfg.reveng.OverrideRepository;
import org.hibernate.cfg.reveng.ReverseEngineeringSettings;
Modified: branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/ant/JPAConfigurationTask.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/ant/JPAConfigurationTask.java 2007-04-11 14:25:13 UTC (rev 11403)
+++ branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/ant/JPAConfigurationTask.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -53,7 +53,7 @@
catch(BuildException be) {
throw be;
}
- catch(Throwable t) {
+ catch(Exception t) {
throw new BuildException("Problems in creating a configuration for JPA. Have you remembered to add hibernate EntityManager jars to the classpath ?",t);
}
Modified: branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/ant/JavaFormatterTask.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/ant/JavaFormatterTask.java 2007-04-11 14:25:13 UTC (rev 11403)
+++ branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/ant/JavaFormatterTask.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -16,8 +16,6 @@
import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.types.FileSet;
-
-import org.eclipse.jdt.internal.core.util.Util;
import org.hibernate.tool.hbm2x.ExporterException;
import org.hibernate.tool.ide.formatting.JavaFormatter;
Modified: branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/Cfg2HbmTool.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/Cfg2HbmTool.java 2007-04-11 14:25:13 UTC (rev 11403)
+++ branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/Cfg2HbmTool.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -16,23 +16,14 @@
import org.hibernate.engine.query.sql.NativeSQLQueryJoinReturn;
import org.hibernate.engine.query.sql.NativeSQLQueryReturn;
import org.hibernate.engine.query.sql.NativeSQLQueryRootReturn;
-import org.hibernate.mapping.Any;
-import org.hibernate.mapping.Array;
-import org.hibernate.mapping.Bag;
import org.hibernate.mapping.Collection;
import org.hibernate.mapping.Column;
-import org.hibernate.mapping.Component;
-import org.hibernate.mapping.DependantValue;
import org.hibernate.mapping.Formula;
-import org.hibernate.mapping.IdentifierBag;
import org.hibernate.mapping.JoinedSubclass;
-import org.hibernate.mapping.List;
import org.hibernate.mapping.ManyToOne;
import org.hibernate.mapping.OneToMany;
-import org.hibernate.mapping.OneToOne;
import org.hibernate.mapping.PersistentClass;
import org.hibernate.mapping.PersistentClassVisitor;
-import org.hibernate.mapping.PrimitiveArray;
import org.hibernate.mapping.Property;
import org.hibernate.mapping.RootClass;
import org.hibernate.mapping.SimpleValue;
@@ -40,7 +31,6 @@
import org.hibernate.mapping.Subclass;
import org.hibernate.mapping.UnionSubclass;
import org.hibernate.mapping.Value;
-import org.hibernate.mapping.ValueVisitor;
import org.hibernate.persister.entity.JoinedSubclassEntityPersister;
import org.hibernate.persister.entity.SingleTableEntityPersister;
import org.hibernate.persister.entity.UnionSubclassEntityPersister;
Modified: branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/DAONewExporter.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/DAONewExporter.java 2007-04-11 14:25:13 UTC (rev 11403)
+++ branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/DAONewExporter.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -6,7 +6,6 @@
import java.util.regex.Pattern;
import org.hibernate.cfg.Configuration;
-import org.hibernate.tool.hbm2x.GenericExporter;
import org.hibernate.tool.hbm2x.pojo.POJOClass;
/**
Modified: branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/MetaAttributeHelper.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/MetaAttributeHelper.java 2007-04-11 14:25:13 UTC (rev 11403)
+++ branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/MetaAttributeHelper.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -1,16 +1,10 @@
package org.hibernate.tool.hbm2x;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
-import java.util.List;
import java.util.Map;
-import org.apache.commons.collections.MultiHashMap;
import org.apache.commons.collections.MultiMap;
-import org.dom4j.Element;
-import org.hibernate.cfg.reveng.MetaAttributeBinder;
-import org.hibernate.mapping.MetaAttribute;
/**
* Helper for loading, merging and accessing <meta> tags.
Modified: branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/StringUtils.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/StringUtils.java 2007-04-11 14:25:13 UTC (rev 11403)
+++ branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/StringUtils.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -54,10 +54,9 @@
* <http://www.apache.org/>.
*/
+import java.util.Iterator;
import java.util.StringTokenizer;
-import java.util.Iterator;
-
/**
* max: Removed methods that dependent on anything else than common.StringUtils.
*
Modified: branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/TemplateHelper.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/TemplateHelper.java 2007-04-11 14:25:13 UTC (rev 11403)
+++ branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/TemplateHelper.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -7,7 +7,6 @@
import java.io.BufferedWriter;
import java.io.File;
-import java.io.FileOutputStream;
import java.io.FileWriter;
import java.io.IOException;
import java.io.Reader;
Modified: branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/TemplateProducer.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/TemplateProducer.java 2007-04-11 14:25:13 UTC (rev 11403)
+++ branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/TemplateProducer.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -75,19 +75,19 @@
return tempWriter.toString();
}
- private void removeFromContext(TemplateHelper th, Map context) {
+ private void removeFromContext(TemplateHelper templateHelper, Map context) {
Iterator iterator = context.entrySet().iterator();
while ( iterator.hasNext() ) {
Map.Entry element = (Map.Entry) iterator.next();
- th.removeFromContext((String) element.getKey(), element.getValue());
+ templateHelper.removeFromContext((String) element.getKey(), element.getValue());
}
}
- private void putInContext(TemplateHelper th, Map context) {
+ private void putInContext(TemplateHelper templateHelper, Map context) {
Iterator iterator = context.entrySet().iterator();
while ( iterator.hasNext() ) {
Map.Entry element = (Map.Entry) iterator.next();
- th.putInContext((String) element.getKey(), element.getValue());
+ templateHelper.putInContext((String) element.getKey(), element.getValue());
}
}
Modified: branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/doc/DocFile.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/doc/DocFile.java 2007-04-11 14:25:13 UTC (rev 11403)
+++ branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/doc/DocFile.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -13,17 +13,17 @@
/**
* The name of the file.
*/
- private String name;
+ final private String name;
/**
* The parent folder.
*/
- private DocFolder folder;
+ final private DocFolder parentFolder;
/**
* The File representation.
*/
- private File file;
+ final private File file;
/**
* Constructor.
@@ -46,9 +46,9 @@
}
name = pName;
- folder = pFolder;
+ parentFolder = pFolder;
- file = new File(folder.getFile(), pName);
+ file = new File(parentFolder.getFile(), pName);
}
/**
@@ -68,7 +68,7 @@
*/
public DocFolder getFolder() {
- return folder;
+ return parentFolder;
}
/**
@@ -88,7 +88,7 @@
*/
public List getPathFolders() {
- return folder.getPathFolders();
+ return parentFolder.getPathFolders();
}
/**
@@ -136,16 +136,16 @@
StringBuffer ref = new StringBuffer();
- DocFolder parentFolder = folder;
- while (parentFolder != null) {
- if (tgtFileFolders.contains(parentFolder) ) {
- ref.append(target.buildRefFromFolder(parentFolder) );
+ DocFolder localFolder = this.parentFolder;
+ while (localFolder != null) {
+ if (tgtFileFolders.contains(localFolder) ) {
+ ref.append(target.buildRefFromFolder(localFolder) );
String result = ref.toString();
return result;
}
else {
ref.append("../");
- parentFolder = parentFolder.getParent();
+ localFolder = localFolder.getParent();
}
}
Modified: branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/doc/DocFileManager.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/doc/DocFileManager.java 2007-04-11 14:25:13 UTC (rev 11403)
+++ branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/doc/DocFileManager.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -8,7 +8,6 @@
import java.util.Iterator;
import java.util.Map;
-import org.hibernate.cfg.Configuration;
import org.hibernate.mapping.Table;
import org.hibernate.tool.hbm2x.pojo.POJOClass;
@@ -147,8 +146,6 @@
super();
- Configuration cfg = docHelper.getCfg();
-
rootDocFolder = new DocFolder(pRootFolder);
mainIndexDocFile = new DocFile("index.html", rootDocFolder);
Modified: branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/doc/DocHelper.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/doc/DocHelper.java 2007-04-11 14:25:13 UTC (rev 11403)
+++ branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/doc/DocHelper.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -117,13 +117,6 @@
private Dialect dialect;
/**
- * To make use of helper methods for javadoc generation
- */
- private Cfg2JavaTool cfg2JavaTool;
-
-
-
- /**
* Constructor.
*
* @param cfg Hibernate configuration.
@@ -333,8 +326,8 @@
* @return a sorted List of POJOClass
*/
public List getClasses(String packageName){
- List classes = (List)classesByPackage.get(packageName);
- List orderedClasses = new ArrayList(classes);
+ List clazzes = (List)classesByPackage.get(packageName);
+ List orderedClasses = new ArrayList(clazzes);
Collections.sort(orderedClasses, POJOCLASS_COMPARATOR);
return orderedClasses;
}
Modified: branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/pojo/AnnotationBuilder.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/pojo/AnnotationBuilder.java 2007-04-11 14:25:13 UTC (rev 11403)
+++ branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/pojo/AnnotationBuilder.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -34,8 +34,8 @@
}
- public AnnotationBuilder resetAnnotation(String annotation) {
- this.annotation = annotation;
+ public AnnotationBuilder resetAnnotation(String annotationName) {
+ this.annotation = annotationName;
clearAttributes();
return this;
}
Modified: branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/seam/SeamExporter.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/seam/SeamExporter.java 2007-04-11 14:25:13 UTC (rev 11403)
+++ branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/seam/SeamExporter.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -1,14 +1,12 @@
package org.hibernate.tool.hbm2x.seam;
import java.io.File;
-import java.util.Map;
import java.util.Properties;
import org.hibernate.cfg.Configuration;
import org.hibernate.tool.hbm2x.AbstractExporter;
import org.hibernate.tool.hbm2x.GenericExporter;
import org.hibernate.tool.hbm2x.POJOExporter;
-import org.hibernate.tool.hbm2x.pojo.POJOClass;
public class SeamExporter extends AbstractExporter {
@@ -34,9 +32,6 @@
super.setupContext();
}
- protected void exportComponent(Map additionalContext, POJOClass element) {
- // noop - we dont want components
- }
public String getName() {
return "hbm2seam";
Modified: branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbmlint/Detector.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbmlint/Detector.java 2007-04-11 14:25:13 UTC (rev 11403)
+++ branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbmlint/Detector.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -8,8 +8,8 @@
private Configuration cfg;
private Settings settings;
- public void initialize(Configuration cfg, Settings settings) {
- this.cfg = cfg;
+ public void initialize(Configuration configuration, Settings settings) {
+ this.cfg = configuration;
this.settings = settings;
}
@@ -21,7 +21,7 @@
return cfg;
}
- public void visit(Configuration cfg, IssueCollector collector) {
+ public void visit(Configuration configuration, IssueCollector collector) {
}
Modified: branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbmlint/detector/SchemaByMetaDataDetector.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbmlint/detector/SchemaByMetaDataDetector.java 2007-04-11 14:25:13 UTC (rev 11403)
+++ branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbmlint/detector/SchemaByMetaDataDetector.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -9,7 +9,6 @@
import org.hibernate.HibernateException;
import org.hibernate.MappingException;
import org.hibernate.cfg.Configuration;
-import org.hibernate.cfg.Environment;
import org.hibernate.cfg.JDBCReaderFactory;
import org.hibernate.cfg.Settings;
import org.hibernate.cfg.reveng.DefaultDatabaseCollector;
@@ -185,7 +184,7 @@
}
else {
//TODO: this needs to be able to know if a type is truly compatible or not. Right now it requires an exact match.
- String sqlType = col.getSqlType( dialect, mapping );
+ //String sqlType = col.getSqlType( dialect, mapping );
int dbTypeCode = dbColumn.getSqlTypeCode().intValue();
int modelTypeCode = col
.getSqlTypeCode( mapping );
Modified: branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/stat/AbstractTreeModel.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/stat/AbstractTreeModel.java 2007-04-11 14:25:13 UTC (rev 11403)
+++ branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/stat/AbstractTreeModel.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -1,8 +1,8 @@
package org.hibernate.tool.stat;
+import javax.swing.event.EventListenerList;
import javax.swing.event.TreeModelEvent;
import javax.swing.event.TreeModelListener;
-import javax.swing.event.EventListenerList;
import javax.swing.tree.TreeModel;
import javax.swing.tree.TreePath;
Modified: branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/stat/BeanTableModel.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/stat/BeanTableModel.java 2007-04-11 14:25:13 UTC (rev 11403)
+++ branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/stat/BeanTableModel.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -1,6 +1,5 @@
package org.hibernate.tool.stat;
-import java.beans.BeanDescriptor;
import java.beans.BeanInfo;
import java.beans.IntrospectionException;
import java.beans.Introspector;
Modified: branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/stat/StatisticsCellRenderer.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/stat/StatisticsCellRenderer.java 2007-04-11 14:25:13 UTC (rev 11403)
+++ branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/stat/StatisticsCellRenderer.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -38,17 +38,17 @@
}
if(value instanceof EntityStatistics) {
- EntityStatistics stats = (EntityStatistics) value;
+ //EntityStatistics stats = (EntityStatistics) value;
}
if(value instanceof CollectionStatistics) {
- CollectionStatistics stats = (CollectionStatistics) value;
+ //CollectionStatistics stats = (CollectionStatistics) value;
}
if(value instanceof QueryStatistics) {
- QueryStatistics stats = (QueryStatistics) value;
+ //QueryStatistics stats = (QueryStatistics) value;
}
Modified: branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/stat/StatisticsTreeModel.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/stat/StatisticsTreeModel.java 2007-04-11 14:25:13 UTC (rev 11403)
+++ branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/stat/StatisticsTreeModel.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -1,6 +1,5 @@
package org.hibernate.tool.stat;
-import java.util.Collections;
import java.util.Map;
import org.hibernate.stat.SecondLevelCacheStatistics;
@@ -39,8 +38,8 @@
} else if(parent==secondlevelcache) {
return stats.getSecondLevelCacheStatistics( stats.getSecondLevelCacheRegionNames()[index]);
} else if(parent instanceof SecondLevelCacheStatistics) {
- SecondLevelCacheStatistics stats = (SecondLevelCacheStatistics) parent;
- return stats.getEntries();
+ SecondLevelCacheStatistics slcs = (SecondLevelCacheStatistics) parent;
+ return slcs.getEntries();
}
return null;
}
Modified: branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/BaseTestCase.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/BaseTestCase.java 2007-04-11 14:25:13 UTC (rev 11403)
+++ branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/BaseTestCase.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -22,6 +22,11 @@
private File outputdir;
+ protected File createBaseFile(String relative) {
+ String root = System.getProperty("hibernatetool.test.supportdir", ".");
+ return new File( root , relative);
+ }
+
public BaseTestCase(String name) {
super(name);
this.outputdir = new File("toolstestoutput", getClass().getName());
@@ -42,11 +47,15 @@
protected void tearDown() throws Exception {
- if (getOutputDir()!=null) TestHelper.deleteDir(getOutputDir());
+ cleanupOutputDir();
assertNoTables();
}
+ private void cleanupOutputDir() {
+ if (getOutputDir()!=null) TestHelper.deleteDir(getOutputDir());
+ }
+
protected String findFirstString(String string, File file) {
return TestHelper.findFirstString(string, file);
Modified: branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/JDBCMetaDataBinderTestCase.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/JDBCMetaDataBinderTestCase.java 2007-04-11 14:25:13 UTC (rev 11403)
+++ branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/JDBCMetaDataBinderTestCase.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -151,7 +151,7 @@
/**
* @param cfg2
*/
- protected void configure(JDBCMetaDataConfiguration cfg) {
+ protected void configure(JDBCMetaDataConfiguration configuration) {
}
@@ -198,8 +198,8 @@
return getTable( cfg, tabName );
}
- protected Table getTable(Configuration cfg, String tabName) {
- Iterator iter = cfg.getTableMappings();
+ protected Table getTable(Configuration configuration, String tabName) {
+ Iterator iter = configuration.getTableMappings();
while(iter.hasNext() ) {
Table table = (Table) iter.next();
if(table.getName().equals(tabName) ) {
@@ -209,8 +209,8 @@
return null;
}
- protected Table getTable(Configuration cfg, String schemaName, String tabName) {
- Iterator iter = cfg.getTableMappings();
+ protected Table getTable(Configuration configuration, String schemaName, String tabName) {
+ Iterator iter = configuration.getTableMappings();
while(iter.hasNext() ) {
Table table = (Table) iter.next();
if(table.getName().equals(tabName) && safeEquals(schemaName, table.getSchema())) {
Modified: branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/NonReflectiveTestCase.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/NonReflectiveTestCase.java 2007-04-11 14:25:13 UTC (rev 11403)
+++ branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/NonReflectiveTestCase.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -1,8 +1,6 @@
//$Id$
package org.hibernate.tool;
-import java.io.File;
-
import org.hibernate.HibernateException;
import org.hibernate.Interceptor;
import org.hibernate.SessionFactory;
@@ -10,7 +8,6 @@
import org.hibernate.cfg.Environment;
import org.hibernate.dialect.Dialect;
import org.hibernate.engine.SessionFactoryImplementor;
-import org.hibernate.tool.test.TestHelper;
public abstract class NonReflectiveTestCase extends BaseTestCase {
Modified: branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/ant/AntHibernateToolTest.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/ant/AntHibernateToolTest.java 2007-04-11 14:25:13 UTC (rev 11403)
+++ branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/ant/AntHibernateToolTest.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -94,7 +94,7 @@
fail("property overrides not accepted");
} catch (BuildException be) {
// should happen
- assertTrue(be.getMessage().indexOf("FAKEDialect")>0);
+ assertTrue(be.getMessage().indexOf("FAKEDialect")>0);
}
}
Modified: branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/ant/BuildFileTestCase.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/ant/BuildFileTestCase.java 2007-04-11 14:25:13 UTC (rev 11403)
+++ branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/ant/BuildFileTestCase.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -209,9 +209,9 @@
fullLogBuffer = new StringBuffer();
project = new Project();
project.init();
- project.setUserProperty( "ant.file" , new File(filename).getAbsolutePath() );
- project.addBuildListener(new AntTestListener(logLevel) );
- ProjectHelper.configureProject(project, new File(filename) );
+ project.setUserProperty( "ant.file" , createBaseFile( filename).getAbsolutePath() );
+ project.addBuildListener(new AntTestListener(logLevel) );
+ ProjectHelper.configureProject(project, createBaseFile(filename) );
}
/**
Added: branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/ant/CoreTaskTest.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/ant/CoreTaskTest.java (rev 0)
+++ branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/ant/CoreTaskTest.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -0,0 +1,49 @@
+/*
+ * Created on 13-Feb-2005
+ *
+ */
+package org.hibernate.tool.ant;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+/**
+ * @author max
+ *
+ */
+public class CoreTaskTest extends BuildFileTestCase {
+
+ public CoreTaskTest(String name) {
+ super(name);
+ }
+
+
+ protected void tearDown() throws Exception {
+ System.out.println(getLog() );
+// super.tearDown();
+ }
+
+
+
+ protected void setUp() throws Exception {
+ configureProject("src/testsupport/coretest-build.xml");
+ }
+
+ public void testSchemaUpdateWarning() {
+ executeTarget("test-schemaupdatewarning");
+ assertLogContaining( "Hibernate Core SchemaUpdate" );
+ assertLogContaining( "tools.hibernate.org" );
+ }
+
+ public void testSchemaExportWarning() {
+ executeTarget("test-schemaexportwarning");
+ assertLogContaining( "Hibernate Core SchemaUpdate" );
+ assertLogContaining( "tools.hibernate.org" );
+ }
+
+ public static Test suite() {
+ return new TestSuite(CoreTaskTest.class);
+ }
+
+
+}
Modified: branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/ant/JavaFormatterTest.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/ant/JavaFormatterTest.java 2007-04-11 14:25:13 UTC (rev 11403)
+++ branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/ant/JavaFormatterTest.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -10,8 +10,6 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.eclipse.jdt.core.ToolFactory;
-import org.eclipse.jdt.core.formatter.CodeFormatter;
import org.hibernate.tool.ide.formatting.JavaFormatter;
/**
Modified: branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/CachedMetaDataTest.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/CachedMetaDataTest.java 2007-04-11 14:25:13 UTC (rev 11403)
+++ branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/CachedMetaDataTest.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -4,9 +4,7 @@
*/
package org.hibernate.tool.hbm2x;
-import java.util.ArrayList;
import java.util.Iterator;
-import java.util.List;
import org.hibernate.cfg.JDBCMetaDataConfiguration;
import org.hibernate.cfg.JDBCReaderFactory;
@@ -15,16 +13,12 @@
import org.hibernate.cfg.reveng.DefaultDatabaseCollector;
import org.hibernate.cfg.reveng.DefaultReverseEngineeringStrategy;
import org.hibernate.cfg.reveng.JDBCReader;
-import org.hibernate.cfg.reveng.SchemaSelection;
import org.hibernate.cfg.reveng.dialect.CachedMetaDataDialect;
-import org.hibernate.cfg.reveng.dialect.JDBCMetaDataDialect;
import org.hibernate.cfg.reveng.dialect.MetaDataDialect;
import org.hibernate.connection.ConnectionProvider;
import org.hibernate.exception.SQLExceptionConverter;
import org.hibernate.mapping.Table;
import org.hibernate.tool.JDBCMetaDataBinderTestCase;
-import org.hibernate.tool.hbm2x.IncrementalSchemaReadingTest.MockedMetaDataDialect;
-import org.hibernate.tool.hbmlint.detector.TableSelectorStrategy;
@@ -34,8 +28,8 @@
*/
public class CachedMetaDataTest extends JDBCMetaDataBinderTestCase {
- protected void configure(JDBCMetaDataConfiguration cfg) {
- super.configure( cfg );
+ protected void configure(JDBCMetaDataConfiguration configuration) {
+ super.configure( configuration );
}
public class MockedMetaDataDialect implements MetaDataDialect {
@@ -110,6 +104,14 @@
public void setFailOnDelegateAccess(boolean b) {
failOnDelegateAccess = b;
}
+
+ public Iterator getSuggestedPrimaryKeyStrategyName(String catalog, String schema, String name) {
+ if(failOnDelegateAccess) {
+ throw new IllegalStateException("delegate not accessible");
+ } else {
+ return delegate.getTables( catalog, schema, name );
+ }
+ }
}
Modified: branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/DefaultSchemaCatalogTest.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/DefaultSchemaCatalogTest.java 2007-04-11 14:25:13 UTC (rev 11403)
+++ branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/DefaultSchemaCatalogTest.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -28,8 +28,8 @@
public class DefaultSchemaCatalogTest extends JDBCMetaDataBinderTestCase {
- protected void configure(JDBCMetaDataConfiguration cfg) {
- super.configure( cfg );
+ protected void configure(JDBCMetaDataConfiguration configuration) {
+ super.configure( configuration );
}
public void testReadOnlySpecificSchema() {
@@ -121,7 +121,7 @@
protected String[] getCreateSQL() {
return new String[] {
- "create schema ovrtest AUTHORIZATION DBA ",
+ "create schema ovrtest AUTHORIZATION DBA",
"create table ovrtest.catmaster ( id char not null, name varchar(20), primary key (id) )",
"create table ovrtest.catchild ( childid char not null, masterref char, primary key (childid), foreign key (masterref) references catmaster(id) )",
"create table master ( id char not null, name varchar(20), primary key (id) )",
Modified: branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/Hbm2JavaEjb3Test.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/Hbm2JavaEjb3Test.java 2007-04-11 14:25:13 UTC (rev 11403)
+++ branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/Hbm2JavaEjb3Test.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -8,7 +8,6 @@
import java.util.ArrayList;
import java.util.List;
-import org.hibernate.mapping.Column;
import org.hibernate.mapping.PersistentClass;
import org.hibernate.mapping.Property;
import org.hibernate.tool.NonReflectiveTestCase;
Modified: branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/Hbm2JavaTest.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/Hbm2JavaTest.java 2007-04-11 14:25:13 UTC (rev 11403)
+++ branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/Hbm2JavaTest.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -320,11 +320,13 @@
assertEquals( 3, wl.size() );
PersistentClass uni = getCfg().getClassMapping( "HelloUniverse" );
- pjc = c2j.getPOJOClass(pc);
+ pjc = c2j.getPOJOClass(uni);
List local = pjc.getPropertyClosureForFullConstructor();
- assertEquals( 3, local.size() );
+ assertEquals( 6, local.size() );
- assertEquals( local.get( 0 ), wl.get( 0 ) );
+ for(int i=0;i<wl.size();i++) {
+ assertEquals( i + " position should be the same", local.get( i ), wl.get( i ) );
+ }
}
Modified: branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/IncrementalSchemaReadingTest.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/IncrementalSchemaReadingTest.java 2007-04-11 14:25:13 UTC (rev 11403)
+++ branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/IncrementalSchemaReadingTest.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -30,8 +30,8 @@
public class IncrementalSchemaReadingTest extends JDBCMetaDataBinderTestCase {
- protected void configure(JDBCMetaDataConfiguration cfg) {
- super.configure( cfg );
+ protected void configure(JDBCMetaDataConfiguration configuration) {
+ super.configure( configuration );
}
public class MockedMetaDataDialect extends JDBCMetaDataDialect {
Modified: branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/Hbm2HbmXmlTest.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/Hbm2HbmXmlTest.java 2007-04-11 14:25:13 UTC (rev 11403)
+++ branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/Hbm2HbmXmlTest.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -187,7 +187,7 @@
SAXReader xmlReader = this.getSAXReader();
Document document = xmlReader.read(outputXml);
- Element root = document.getRootElement();
+
XPath xpath = DocumentHelper.createXPath("//hibernate-mapping/class/comment");
List list = xpath.selectNodes(document);
Modified: branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/InheritanceTest.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/InheritanceTest.java 2007-04-11 14:25:13 UTC (rev 11403)
+++ branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/InheritanceTest.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -12,12 +12,10 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.dom4j.io.SAXReader;
import org.hibernate.cfg.Configuration;
import org.hibernate.tool.NonReflectiveTestCase;
import org.hibernate.tool.hbm2x.Exporter;
import org.hibernate.tool.hbm2x.HibernateMappingExporter;
-import org.hibernate.util.DTDEntityResolver;
/**
* this test should be fixed to have a proper model. currently a mix of subclass/joinedsubclass is in play.
@@ -65,12 +63,7 @@
}
- private SAXReader getSAXReader() {
- SAXReader xmlReader = new SAXReader();
- xmlReader.setEntityResolver(new DTDEntityResolver() );
- xmlReader.setValidation(true);
- return xmlReader;
- }
+
protected String getBaseForMappings() {
return "org/hibernate/tool/hbm2x/hbm2hbmxml/";
Modified: branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/hbmlint/HbmLintTest.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/hbmlint/HbmLintTest.java 2007-04-11 14:25:13 UTC (rev 11403)
+++ branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/hbmlint/HbmLintTest.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -21,22 +21,22 @@
public void testExporter() {
- Configuration cfg = new Configuration();
- addMappings( getMappings(), cfg );
- cfg.buildMappings();
+ Configuration configuration = new Configuration();
+ addMappings( getMappings(), configuration );
+ configuration.buildMappings();
- new HbmLintExporter(cfg, getOutputDir()).start();
+ new HbmLintExporter(configuration, getOutputDir()).start();
}
public void testValidateCache() {
- Configuration cfg = new Configuration();
- addMappings( getMappings(), cfg );
- cfg.buildMappings();
+ Configuration configuration = new Configuration();
+ addMappings( getMappings(), configuration );
+ configuration.buildMappings();
HbmLint analyzer = new HbmLint(new Detector[] { new BadCachingDetector() });
- analyzer.analyze(cfg);
+ analyzer.analyze(configuration);
List result = analyzer.getResults();
@@ -48,13 +48,13 @@
public void testValidateIdentifier() {
- Configuration cfg = new Configuration();
- addMappings( getMappings(), cfg );
- cfg.buildMappings();
+ Configuration configuration = new Configuration();
+ addMappings( getMappings(), configuration );
+ configuration.buildMappings();
HbmLint analyzer = new HbmLint(new Detector[] { new ShadowedIdentifierDetector() });
- analyzer.analyze(cfg);
+ analyzer.analyze(configuration);
List result = analyzer.getResults();
@@ -66,13 +66,13 @@
public void testBytecodeRestrictions() {
- Configuration cfg = new Configuration();
- addMappings( getMappings(), cfg );
- cfg.buildMappings();
+ Configuration configuration = new Configuration();
+ addMappings( getMappings(), configuration );
+ configuration.buildMappings();
HbmLint analyzer = new HbmLint(new Detector[] { new InstrumentationDetector() });
- analyzer.analyze(cfg);
+ analyzer.analyze(configuration);
List result = analyzer.getResults();
Modified: branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/hbmlint/SchemaAnalyzerTest.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/hbmlint/SchemaAnalyzerTest.java 2007-04-11 14:25:13 UTC (rev 11403)
+++ branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/hbmlint/SchemaAnalyzerTest.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -30,14 +30,14 @@
}
public void testSchemaAnalyzer() {
- Configuration cfg = new Configuration();
- addMappings( getMappings(), cfg );
- cfg.buildMappings();
+ Configuration configuration = new Configuration();
+ addMappings( getMappings(), configuration );
+ configuration.buildMappings();
SchemaByMetaDataDetector analyzer = new SchemaByMetaDataDetector();
- analyzer.initialize( cfg, cfg.buildSettings() );
+ analyzer.initialize( configuration, configuration.buildSettings() );
- Iterator tableMappings = cfg.getTableMappings();
+ Iterator tableMappings = configuration.getTableMappings();
while ( tableMappings.hasNext() ) {
@@ -46,17 +46,17 @@
MockCollector mc = new MockCollector();
if(table.getName().equalsIgnoreCase( "missingtable" )) {
- analyzer.visit( cfg, table, mc );
+ analyzer.visit( configuration, table, mc );
assertEquals(mc.problems.size(),1);
Issue ap = (Issue) mc.problems.get( 0 );
assertTrue(ap.getDescription().indexOf( "Missing table" ) >=0);
} else if(table.getName().equalsIgnoreCase( "category" )) {
- analyzer.visit( cfg, table, mc );
+ analyzer.visit( configuration, table, mc );
assertEquals(mc.problems.size(),1);
Issue ap = (Issue) mc.problems.get( 0 );
assertTrue(ap.getDescription().indexOf( "missing column: name" ) >=0);
} else if(table.getName().equalsIgnoreCase( "badtype" )) {
- analyzer.visit( cfg, table, mc );
+ analyzer.visit( configuration, table, mc );
assertEquals(mc.problems.size(),1);
Issue ap = (Issue) mc.problems.get( 0 );
assertTrue(ap.getDescription().indexOf( "wrong column type for name" ) >=0);
@@ -66,7 +66,7 @@
}
MockCollector mc = new MockCollector();
- analyzer.visitGenerators( cfg, mc );
+ analyzer.visitGenerators( configuration, mc );
assertEquals(1,mc.problems.size());
Issue issue = (Issue) mc.problems.get( 0 );
assertTrue(issue.getDescription().indexOf( "hibernate_unique_key" ) >=0);
@@ -77,11 +77,11 @@
public void testExporter() {
- Configuration cfg = new Configuration();
- addMappings( getMappings(), cfg );
- cfg.buildMappings();
+ Configuration configuration = new Configuration();
+ addMappings( getMappings(), configuration );
+ configuration.buildMappings();
- new HbmLintExporter(cfg, getOutputDir()).start();
+ new HbmLintExporter(configuration, getOutputDir()).start();
}
Modified: branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/ide/completion/HqlAnalyzerTest.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/ide/completion/HqlAnalyzerTest.java 2007-04-11 14:25:13 UTC (rev 11403)
+++ branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/ide/completion/HqlAnalyzerTest.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -117,8 +117,7 @@
assertEquals("Invalid visible query size", size, visible.size());
}
- private void doTestSubQueries(String query, int size) {
- char[] cs = query.toCharArray();
+ private void doTestSubQueries(String query, int size) {
List l = new HQLAnalyzer().getSubQueries(query.toCharArray(), 0).subQueries;
assertEquals("Incorrent subqueries count", size, l.size());
}
Modified: branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/ide/completion/ModelCompletionTest.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/ide/completion/ModelCompletionTest.java 2007-04-11 14:25:13 UTC (rev 11403)
+++ branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/ide/completion/ModelCompletionTest.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -169,7 +169,7 @@
public void testProductOwnerAddress() {
String query = "select p from Product p where p.owner.";
- List visible = getVisibleEntityNames(query.toCharArray(), query.length());
+ List visible = getVisibleEntityNames(query.toCharArray());
Collector hcc = new Collector();
@@ -179,18 +179,18 @@
hcc.clear();
query = "select p from Product p where p.owner.address.";
- visible = getVisibleEntityNames(query.toCharArray(), query.length());
+ visible = getVisibleEntityNames(query.toCharArray());
cc.getMatchingProperties( cc.getCanonicalPath(visible, "p.owner.address"), "", hcc );
doTestFields(hcc.getCompletionProposals(), new String[] {"id", "number", "street"});
}
- private List getVisibleEntityNames(char[] cs, int i) {
+ private List getVisibleEntityNames(char[] cs) {
return new HQLAnalyzer().getVisibleEntityNames( cs, cs.length);
}
public void testStoreCity() {
String query = "select p from Product p join p.stores store where store";
- List visible = getVisibleEntityNames(query.toCharArray(), query.length());
+ List visible = getVisibleEntityNames(query.toCharArray());
Collector hcc = new Collector();
String canonicalPath = cc.getCanonicalPath(visible, "store.city");
@@ -207,7 +207,7 @@
private void doTestUnaliasedProductQuery(final String query) {
Collector hcc = new Collector();
- List visible = getVisibleEntityNames(query.toCharArray(), query.length());
+ List visible = getVisibleEntityNames(query.toCharArray());
cc.getMatchingProperties( cc.getCanonicalPath(visible, "owner"), "f", hcc );
HQLCompletionProposal[] completionProposals = hcc.getCompletionProposals();
@@ -397,7 +397,7 @@
HQLCompletionProposal[] completionProposals = c.getCompletionProposals();
assertEquals(3, completionProposals.length);
- HQLCompletionProposal proposal = completionProposals[0];
+ assertNotNull(completionProposals[0]);
c.clear();
Modified: branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/test/TestHelper.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/test/TestHelper.java 2007-04-11 14:25:13 UTC (rev 11403)
+++ branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/test/TestHelper.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -111,6 +111,7 @@
// return javaCompile( arguments );
}
+ /* Uses the JDK javac tools.
private static boolean javaCompile(String[] arguments) {
StringWriter sw = new StringWriter();
int result = com.sun.tools.javac.Main.compile( arguments,
@@ -121,7 +122,7 @@
else {
return true;
}
- }
+ }*/
/**
* @param ext
Modified: branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/CompositeIdTest.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/CompositeIdTest.java 2007-04-11 14:25:13 UTC (rev 11403)
+++ branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/CompositeIdTest.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -39,8 +39,8 @@
*/
public class CompositeIdTest extends JDBCMetaDataBinderTestCase {
- protected void configure(JDBCMetaDataConfiguration cfg) {
- super.configure( cfg );
+ protected void configure(JDBCMetaDataConfiguration configuration) {
+ super.configure( configuration );
}
protected String[] getCreateSQL() {
Modified: branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/ForeignKeysTest.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/ForeignKeysTest.java 2007-04-11 14:25:13 UTC (rev 11403)
+++ branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/ForeignKeysTest.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -66,7 +66,7 @@
}
public void testMasterChild() {
- Table master = getTable(identifier("master") );
+ assertNotNull(getTable(identifier("master") ));
Table child = getTable(identifier("child") );
Iterator iterator = child.getForeignKeyIterator();
Modified: branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/KeyPropertyCompositeIdTest.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/KeyPropertyCompositeIdTest.java 2007-04-11 14:25:13 UTC (rev 11403)
+++ branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/KeyPropertyCompositeIdTest.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -9,9 +9,9 @@
public class KeyPropertyCompositeIdTest extends CompositeIdTest {
- protected void configure(JDBCMetaDataConfiguration cfg) {
- super.configure( cfg );
- cfg.setPreferBasicCompositeIds(false);
+ protected void configure(JDBCMetaDataConfiguration configuration) {
+ super.configure( configuration );
+ configuration.setPreferBasicCompositeIds(false);
}
public static Test suite() {
Modified: branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/ManyToManyTest.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/ManyToManyTest.java 2007-04-11 14:25:13 UTC (rev 11403)
+++ branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/ManyToManyTest.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -31,8 +31,8 @@
private JDBCMetaDataConfiguration localCfg;
- protected void configure(JDBCMetaDataConfiguration cfg) {
- super.configure( cfg );
+ protected void configure(JDBCMetaDataConfiguration configuration) {
+ super.configure( configuration );
}
Added: branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/MySQLAutoIncrementTest.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/MySQLAutoIncrementTest.java (rev 0)
+++ branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/MySQLAutoIncrementTest.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -0,0 +1,75 @@
+/*
+ * Created on 2004-11-23
+ *
+ */
+package org.hibernate.tool.test.jdbc2cfg;
+
+import java.sql.SQLException;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.hibernate.cfg.JDBCMetaDataConfiguration;
+import org.hibernate.cfg.reveng.dialect.MySQLMetaDataDialect;
+import org.hibernate.dialect.Dialect;
+import org.hibernate.dialect.MySQLDialect;
+import org.hibernate.mapping.PersistentClass;
+import org.hibernate.mapping.SimpleValue;
+import org.hibernate.tool.JDBCMetaDataBinderTestCase;
+
+/**
+ * @author max
+ *
+ */
+public class MySQLAutoIncrementTest extends JDBCMetaDataBinderTestCase {
+
+
+ /**
+ * @return
+ */
+ protected String[] getDropSQL() {
+ return new String[] {
+ "drop table `autoinc`",
+ "drop table `noautoinc`",
+ };
+ }
+
+ /**
+ * @return
+ */
+ protected String[] getCreateSQL() {
+
+ return new String[] {
+ "CREATE TABLE `autoinc` (`id` int(11) NOT NULL auto_increment, `data` varchar(100) default NULL, PRIMARY KEY (`id`))",
+ "CREATE TABLE `noautoinc` (`id` int(11) NOT NULL, `data` varchar(100) default NULL, PRIMARY KEY (`id`))",
+ };
+ }
+
+ public boolean appliesTo(Dialect dialect) {
+ return dialect instanceof MySQLDialect;
+ }
+
+ protected void configure(JDBCMetaDataConfiguration configuration) {
+ configuration.setProperty( "hibernatetool.metadatadialect", MySQLMetaDataDialect.class.getName() );
+ }
+
+ public void testAutoIncrement() throws SQLException {
+ PersistentClass classMapping = cfg.getClassMapping(toClassName("autoinc") );
+ assertNotNull(classMapping);
+
+ assertEquals("identity", ((SimpleValue)classMapping.getIdentifierProperty().getValue()).getIdentifierGeneratorStrategy());
+
+ classMapping = cfg.getClassMapping(toClassName("noautoinc") );
+ assertEquals("assigned", ((SimpleValue)classMapping.getIdentifierProperty().getValue()).getIdentifierGeneratorStrategy());
+
+ }
+
+ public void assertNoTables() throws SQLException {
+ // can't do that on mysql
+ }
+
+ public static Test suite() {
+ return new TestSuite(MySQLAutoIncrementTest.class);
+ }
+
+}
Modified: branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/OracleCompositeIdOrderTest.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/OracleCompositeIdOrderTest.java 2007-04-11 14:25:13 UTC (rev 11403)
+++ branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/OracleCompositeIdOrderTest.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -25,9 +25,9 @@
*/
public class OracleCompositeIdOrderTest extends JDBCMetaDataBinderTestCase {
- protected void configure(JDBCMetaDataConfiguration cfg) {
- cfg.setPreferBasicCompositeIds(false);
- super.configure( cfg );
+ protected void configure(JDBCMetaDataConfiguration configuration) {
+ configuration.setPreferBasicCompositeIds(false);
+ super.configure( configuration );
}
Modified: branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/OracleViewsTest.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/OracleViewsTest.java 2007-04-11 14:25:13 UTC (rev 11403)
+++ branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/OracleViewsTest.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -57,8 +57,8 @@
return dialect instanceof Oracle9Dialect;
}
- protected void configure(JDBCMetaDataConfiguration cfg) {
- cfg.setProperty( "hibernatetool.metadatadialect", OracleMetaDataDialect.class.getName() );
+ protected void configure(JDBCMetaDataConfiguration configuration) {
+ configuration.setProperty( "hibernatetool.metadatadialect", OracleMetaDataDialect.class.getName() );
}
public void testViewAndSynonyms() throws SQLException {
Modified: branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/OverrideBinderTest.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/OverrideBinderTest.java 2007-04-11 14:25:13 UTC (rev 11403)
+++ branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/OverrideBinderTest.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -289,6 +289,7 @@
assertNotNull(foundTable);
Iterator fkiter = foundTable.getForeignKeyIterator();
ForeignKey fk1 = (ForeignKey) fkiter.next();
+ assertNotNull(fk1);
assertFalse(fkiter.hasNext() );
@@ -488,12 +489,11 @@
}
- protected void configure(JDBCMetaDataConfiguration cfg) {
- super.configure(cfg);
- Settings s = cfg.buildSettings();
+ protected void configure(JDBCMetaDataConfiguration configuration) {
+ super.configure(configuration);
OverrideRepository or = new OverrideRepository();
or.addResource(OVERRIDETEST_REVENG_XML);
- cfg.setReverseEngineeringStrategy(or.getReverseEngineeringStrategy(new DefaultReverseEngineeringStrategy() ) );
+ configuration.setReverseEngineeringStrategy(or.getReverseEngineeringStrategy(new DefaultReverseEngineeringStrategy() ) );
}
private String getPropertyTypeName(Property property) {
Modified: branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/PersistentClassesTest.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/PersistentClassesTest.java 2007-04-11 14:25:13 UTC (rev 11403)
+++ branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/PersistentClassesTest.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -24,7 +24,6 @@
import org.hibernate.mapping.Property;
import org.hibernate.mapping.Set;
import org.hibernate.tool.JDBCMetaDataBinderTestCase;
-import org.hibernate.tool.stat.StatisticsBrowser;
import persistentclasses.Item;
import persistentclasses.Orders;
Modified: branches/Branch_3_2/HibernateExt/tools/src/testsupport/NoopReverseEngineeringStrategy.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/testsupport/NoopReverseEngineeringStrategy.java 2007-04-11 14:25:13 UTC (rev 11403)
+++ branches/Branch_3_2/HibernateExt/tools/src/testsupport/NoopReverseEngineeringStrategy.java 2007-04-13 14:29:43 UTC (rev 11404)
@@ -2,11 +2,10 @@
import java.util.Map;
import java.util.Properties;
+import org.hibernate.cfg.reveng.ReverseEngineeringRuntimeInfo;
import org.hibernate.cfg.reveng.ReverseEngineeringSettings;
import org.hibernate.cfg.reveng.ReverseEngineeringStrategy;
import org.hibernate.cfg.reveng.TableIdentifier;
-import org.hibernate.connection.ConnectionProvider;
-import org.hibernate.exception.SQLExceptionConverter;
import org.hibernate.mapping.ForeignKey;
import org.hibernate.mapping.Table;
@@ -79,7 +78,7 @@
return null;
}
- public void configure(ConnectionProvider provider, SQLExceptionConverter sec) {
+ public void configure(ReverseEngineeringRuntimeInfo runtimeInfo) {
// TODO Auto-generated method stub
}
Modified: branches/Branch_3_2/HibernateExt/tools/src/testsupport/anttest-build.xml
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/testsupport/anttest-build.xml 2007-04-11 14:25:13 UTC (rev 11403)
+++ branches/Branch_3_2/HibernateExt/tools/src/testsupport/anttest-build.xml 2007-04-13 14:29:43 UTC (rev 11404)
@@ -221,6 +221,8 @@
</target>
<target name="jpa-boguspunit">
+ <property file="${hibernate-core.lib.dir}/version.properties" prefix="h3"/>
+
<path id="annlib">
<path location="${build.dir}/../../lib/freemarker.jar" />
@@ -232,11 +234,8 @@
<path location="${build.dir}/../../lib/testlibs/javaassist.jar" />
<path location="${build.dir}/../classes" />
<path location="${hibernate-core.home}\jdbc\hsqldb.jar" />
- <!-- <fileset dir="${hibernate-core.lib.dir}">
-
- </fileset>-->
</path>
- <taskdef name="hibernatetool" classname="org.hibernate.tool.ant.HibernateToolTask" classpathref="annlib" />
+<!-- <taskdef name="hibernatetool" classname="org.hibernate.tool.ant.HibernateToolTask" classpathref="annlib" /> -->
<delete dir="${build.dir}/ejb3" />
<mkdir dir="${build.dir}/ejb3" />
@@ -265,17 +264,34 @@
</target>
<target name="jpa-punit">
+ <property file="${hibernate-core.lib.dir}/version.properties" prefix="h3"/>
+ <property name="testlibs" location="${build.dir}/../../lib/testlibs"/>
<path id="annlib">
+ <path location="${build.dir}/../classes" />
+ <path location="${testlibs}/hibernate3.jar"/>
+ <path location="${testlibs}/${h3.commons-logging.lib}"/>
+ <path location="${testlibs}/${h3.dom4j.lib}"/>
+ <path location="${testlibs}/${h3.cglib.lib}"/>
+ <path location="${hibernate-core.home}\jdbc\hsqldb.jar" />
+ <path location="${testlibs}/${h3.ehcache.lib}"/>
+ <path location="${testlibs}/${h3.commons-collections.lib}"/>
<path location="${build.dir}/../../lib/freemarker.jar" />
+ <path location="${testlibs}/ejb3-persistence.jar" />
+ <path location="${testlibs}/hibernate-entitymanager.jar" />
+ <path location="${testlibs}/jboss-archive-browsing.jar" />
+ <path location="${testlibs}/hibernate-annotations.jar" />
+ <path location="${testlibs}/javassist.jar" />
+ <!--
- <path location="${build.dir}/../../lib/testlibs/hibernate3.jar" />
+
+
<path location="${build.dir}/../../lib/testlibs/hibernate-annotations.jar" />
<path location="${build.dir}/../../lib/testlibs/ejb3-persistence.jar" />
<path location="${build.dir}/../../lib/testlibs/hibernate-entitymanager.jar" />
<path location="${build.dir}/../../lib/testlibs/jboss-archive-browsing.jar" />
<path location="${build.dir}/../../lib/testlibs/javaassist.jar" />
- <path location="${build.dir}/../classes" />
- <path location="${hibernate-core.home}\jdbc\hsqldb.jar" />
+
+ <path location="${hibernate-core.home}\jdbc\hsqldb.jar" /> -->
<!-- <fileset dir="${hibernate-core.lib.dir}">
</fileset>-->
@@ -298,7 +314,7 @@
<copy file="ejb3test-hibernate.cfg.xml" tofile="${build.dir}/ejb3/classes/ejb3test-hibernate.cfg.xml" />
<hibernatetool destdir="${build.dir}">
- <jpaconfiguration persistenceunit="ejb3test" entityresolver="DummyEntityResolver"/>
+ <jpaconfiguration persistenceunit="ejb3test"/>
<classpath>
<path location="${build.dir}/ejb3/classes" />
</classpath>
Added: branches/Branch_3_2/HibernateExt/tools/src/testsupport/coretest-build.xml
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/testsupport/coretest-build.xml (rev 0)
+++ branches/Branch_3_2/HibernateExt/tools/src/testsupport/coretest-build.xml 2007-04-13 14:29:43 UTC (rev 11404)
@@ -0,0 +1,42 @@
+<project name="coreanttest">
+ <property name="hibernate-core.jar" location="../../../../hibernate-3.1/hibernate3.jar" />
+ <property name="hibernate-core.home" location="../../../../hibernate3" />
+ <property name="hibernate-core.lib.dir" location="${hibernate-core.home}/lib" />
+ <property name="build.dir" location="../../build/anttest" />
+ <property file="../../etc/hibernate.properties" />
+
+
+
+ <path id="tasks.classpath">
+ <fileset dir="${hibernate-core.lib.dir}">
+ <include name="**/*.jar" />
+ </fileset>
+
+ <pathelement location="${hibernate-core.jar}" />
+ <pathelement path="${hibernate-core.home}\jdbc\hsqldb.jar" />
+ </path>
+
+
+
+ <target name="test-schemaexportwarning">
+ <taskdef name="schemaexport" classname="org.hibernate.tool.hbm2ddl.SchemaExportTask" classpathref="tasks.classpath" />
+
+ <schemaexport drop="true" quiet="false" text="false">
+ <fileset dir="../test" id="id">
+ <include name="**/*TopDown.hbm.xml" />
+ </fileset>
+ </schemaexport>
+ </target>
+
+ <target name="test-schemaupdatewarning">
+ <taskdef name="schemaupdate" classname="org.hibernate.tool.hbm2ddl.SchemaUpdateTask" classpathref="tasks.classpath" />
+
+ <schemaupdate quiet="false" text="false">
+ <fileset dir="../test" id="id">
+ <include name="**/*TopDown.hbm.xml" />
+ </fileset>
+ </schemaupdate>
+ </target>
+
+
+</project>
More information about the hibernate-commits
mailing list