Hibernate SVN: r10650 - in branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate: annotationfactory cfg reflection/java reflection/java/xml validator
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2006-10-24 21:18:29 -0400 (Tue, 24 Oct 2006)
New Revision: 10650
Modified:
branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotationfactory/AnnotationFactory.java
branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/AnnotationConfiguration.java
branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/reflection/java/EJB3OverridenAnnotationReader.java
branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/reflection/java/JavaXAnnotatedElement.java
branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/reflection/java/JavaXClass.java
branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/reflection/java/JavaXFactory.java
branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/reflection/java/xml/XMLContext.java
branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/validator/ClassValidator.java
Log:
Various optimizations, mostly in the XLayer
ANN-475 EJBOverridenAnnotationReader is used only if there is an XMLContext
ANN-456 Done and used for the ClassValidator used for apply() in AnnotationConfiguration
ANN-474
Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotationfactory/AnnotationFactory.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotationfactory/AnnotationFactory.java 2006-10-24 22:55:36 UTC (rev 10649)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotationfactory/AnnotationFactory.java 2006-10-25 01:18:29 UTC (rev 10650)
@@ -18,7 +18,9 @@
@SuppressWarnings("unchecked")
public static <T extends Annotation> T create(AnnotationDescriptor descriptor) {
ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
- Class<T> proxyClass = (Class<T>) Proxy.getProxyClass( classLoader, descriptor.type() );
+ //TODO round 34ms to generate the proxy, hug! is Javassist Faster?
+ //TODO prebuild the javax.persistence and org.hibernate.annotations classes?
+ Class<T> proxyClass = (Class<T>) Proxy.getProxyClass( classLoader, descriptor.type() );
InvocationHandler handler = new AnnotationProxy( descriptor );
try {
return getProxyInstance( proxyClass, handler );
Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/AnnotationConfiguration.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/AnnotationConfiguration.java 2006-10-24 22:55:36 UTC (rev 10649)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/AnnotationConfiguration.java 2006-10-25 01:18:29 UTC (rev 10650)
@@ -312,11 +312,11 @@
}
for ( PersistentClass persistentClazz : (Collection<PersistentClass>) classes.values() ) {
//integrate the validate framework
- // TODO: migrate the Validator to the X layer
String className = persistentClazz.getClassName();
if ( StringHelper.isNotEmpty( className ) ) {
try {
- new ClassValidator( ReflectHelper.classForName( className ) ).apply( persistentClazz );
+ new ClassValidator( ReflectHelper.classForName( className ), null, null, null, reflectionManager )
+ .apply( persistentClazz );
}
catch (ClassNotFoundException e) {
//swallow them
Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/reflection/java/EJB3OverridenAnnotationReader.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/reflection/java/EJB3OverridenAnnotationReader.java 2006-10-24 22:55:36 UTC (rev 10649)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/reflection/java/EJB3OverridenAnnotationReader.java 2006-10-25 01:18:29 UTC (rev 10650)
@@ -354,9 +354,9 @@
getAssociation( OneToOne.class, annotationList, defaults );
getAssociation( OneToMany.class, annotationList, defaults );
getAssociation( ManyToMany.class, annotationList, defaults );
- Annotation current = getSequenceGenerator( tree, defaults );
+ Annotation current = getSequenceGenerator( elementsForProperty, defaults );
if ( current != null ) annotationList.add( current );
- current = getTableGenerator( tree, defaults );
+ current = getTableGenerator( elementsForProperty, defaults );
if ( current != null ) annotationList.add( current );
}
@@ -376,7 +376,39 @@
}
}
- private void processEventAnnotations(List<Annotation> annotationList, XMLContext.Default defaults) {
+ //TODO mutualize the next 2 methods
+ private Annotation getTableGenerator(List<Element> elementsForProperty, XMLContext.Default defaults) {
+ for (Element element : elementsForProperty) {
+ Element subelement = element != null ? element.element( annotationToXml.get( TableGenerator.class ) ) : null;
+ if ( subelement != null ) {
+ return buildTableGeneratorAnnotation( subelement, defaults );
+ }
+ }
+ if ( elementsForProperty.size() == 0 && defaults.canUseJavaAnnotations() ) {
+ return super.getAnnotation( TableGenerator.class );
+ }
+ else {
+ return null;
+ }
+ }
+
+
+ private Annotation getSequenceGenerator(List<Element> elementsForProperty, XMLContext.Default defaults) {
+ for (Element element : elementsForProperty) {
+ Element subelement = element != null ? element.element( annotationToXml.get( SequenceGenerator.class ) ) : null;
+ if ( subelement != null ) {
+ return buildSequenceGeneratorAnnotation( subelement );
+ }
+ }
+ if ( elementsForProperty.size() == 0 && defaults.canUseJavaAnnotations() ) {
+ return super.getAnnotation( SequenceGenerator.class );
+ }
+ else {
+ return null;
+ }
+ }
+
+ private void processEventAnnotations(List<Annotation> annotationList, XMLContext.Default defaults) {
boolean eventElement = false;
for ( Element element : elementsForProperty ) {
String elementName = element.getName();
@@ -546,7 +578,7 @@
AnnotationDescriptor ad = new AnnotationDescriptor( annotationType );
String className = element.attributeValue( "target-entity" );
if ( className != null ) {
- Class clazz = null;
+ Class clazz;
try {
clazz = ReflectHelper.classForName(
XMLContext.buildSafeClassName( className, defaults ),
@@ -1358,7 +1390,8 @@
}
private NamedQueries getNamedQueries(Element tree, XMLContext.Default defaults) {
- List<NamedQuery> queries = (List<NamedQuery>) buildNamedQueries( tree, false, defaults );
+ //TODO avoid the Proxy Creation (@NamedQueries) when possible
+ List<NamedQuery> queries = (List<NamedQuery>) buildNamedQueries( tree, false, defaults );
if ( defaults.canUseJavaAnnotations() ) {
NamedQuery annotation = super.getAnnotation( NamedQuery.class );
addNamedQueryIfNeeded( annotation, queries );
@@ -1435,7 +1468,6 @@
element.elements( "named-native-query" ) :
element.elements( "named-query" );
List namedQueries = new ArrayList();
- int index = 0;
Iterator it = namedQueryElementList.listIterator();
while ( it.hasNext() ) {
Element subelement = (Element) it.next();
Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/reflection/java/JavaXAnnotatedElement.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/reflection/java/JavaXAnnotatedElement.java 2006-10-24 22:55:36 UTC (rev 10649)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/reflection/java/JavaXAnnotatedElement.java 2006-10-25 01:18:29 UTC (rev 10650)
@@ -19,8 +19,8 @@
private final AnnotatedElement annotatedElement;
public JavaXAnnotatedElement(AnnotatedElement annotatedElement, JavaXFactory factory) {
- this.annotationReader = new EJB3OverridenAnnotationReader( annotatedElement, factory.getXMLContext() );
- this.factory = factory;
+ //this.annotationReader = new EJB3OverridenAnnotationReader( annotatedElement, factory.getXMLContext() );
+ this.factory = factory;
this.annotatedElement = annotatedElement;
}
@@ -29,19 +29,22 @@
}
private JavaAnnotationReader getAnnotationReader() {
- return annotationReader;
+ if (annotationReader == null) {
+ annotationReader = factory.buildAnnotationReader(annotatedElement);
+ }
+ return annotationReader;
}
public <T extends Annotation> T getAnnotation(Class<T> annotationType) {
- return annotationReader.getAnnotation( annotationType );
+ return getAnnotationReader().getAnnotation( annotationType );
}
public <T extends Annotation> boolean isAnnotationPresent(Class<T> annotationType) {
- return annotationReader.isAnnotationPresent( annotationType );
+ return getAnnotationReader().isAnnotationPresent( annotationType );
}
public Annotation[] getAnnotations() {
- return annotationReader.getAnnotations();
+ return getAnnotationReader().getAnnotations();
}
AnnotatedElement toAnnotatedElement() {
@@ -50,7 +53,7 @@
@Override
public boolean equals(Object obj) {
- if ( obj == null || ! ( obj instanceof JavaXAnnotatedElement ) ) return false;
+ if ( ! ( obj instanceof JavaXAnnotatedElement ) ) return false;
JavaXAnnotatedElement other = (JavaXAnnotatedElement) obj;
//FIXME yuk this defeat the type environment
return annotatedElement.equals( other.toAnnotatedElement() );
Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/reflection/java/JavaXClass.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/reflection/java/JavaXClass.java 2006-10-24 22:55:36 UTC (rev 10649)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/reflection/java/JavaXClass.java 2006-10-25 01:18:29 UTC (rev 10650)
@@ -45,12 +45,14 @@
int length = classes.length;
XClass[] xClasses = new XClass[length];
//TypeEnvironment environment = getFactory().getTypeEnvironment( toClass() );
- TypeEnvironment environment =
- new CompoundTypeEnvironment( getTypeEnvironment(), getFactory().getTypeEnvironment( toClass() ) );
- for ( int index = 0; index < length ; index++ ) {
- xClasses[index] = getFactory().toXClass( classes[index], environment );
- }
- return xClasses;
+ if (length != 0) {
+ TypeEnvironment environment =
+ new CompoundTypeEnvironment( getTypeEnvironment(), getFactory().getTypeEnvironment( toClass() ) );
+ for ( int index = 0; index < length ; index++ ) {
+ xClasses[index] = getFactory().toXClass( classes[index], environment );
+ }
+ }
+ return xClasses;
}
public boolean isInterface() {
Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/reflection/java/JavaXFactory.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/reflection/java/JavaXFactory.java 2006-10-24 22:55:36 UTC (rev 10649)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/reflection/java/JavaXFactory.java 2006-10-25 01:18:29 UTC (rev 10650)
@@ -4,6 +4,9 @@
import java.lang.reflect.Method;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
+import java.lang.reflect.AnnotatedElement;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -28,6 +31,7 @@
import org.hibernate.reflection.java.generics.TypeUtils;
import org.hibernate.reflection.java.xml.XMLContext;
import org.hibernate.util.ReflectHelper;
+import org.hibernate.AssertionFailure;
/**
* The factory for all the objects in this package.
@@ -40,8 +44,59 @@
private XMLContext xmlContext;
private HashMap defaults;
+ private static Constructor[] annotationReaderConstructors;
- private static class TypeKey extends Pair<Type, TypeEnvironment> {
+ static {
+ buildAnnotationReaderConstructor();
+ }
+
+
+ public JavaAnnotationReader buildAnnotationReader(AnnotatedElement annotatedElement) {
+ try {
+ if ( xmlContext.hasContext() ) {
+ return (JavaAnnotationReader) annotationReaderConstructors[1].newInstance(annotatedElement, xmlContext);
+ }
+ else {
+ return (JavaAnnotationReader) annotationReaderConstructors[0].newInstance(annotatedElement);
+ }
+ }
+ catch (IllegalAccessException e) {
+ throw new AssertionFailure( "Unable to call AnnotationReader constructor", e );
+ }
+ catch (InvocationTargetException e) {
+ throw new AssertionFailure( "Unable to call AnnotationReader constructor", e );
+ }
+ catch (InstantiationException e) {
+ throw new AssertionFailure( "Unable to call AnnotationReader constructor", e );
+ }
+ }
+
+ private static void buildAnnotationReaderConstructor() {
+ annotationReaderConstructors = new Constructor[2];
+ try {
+ Class readerClass = ReflectHelper.classForName( "org.hibernate.reflection.java.JavaAnnotationReader");
+ annotationReaderConstructors[0] = readerClass.getConstructor( AnnotatedElement.class );
+ }
+ catch (ClassNotFoundException e) {
+ throw new AssertionFailure( "Unable to load org.hibernate.reflection.java.JavaAnnotationReader", e );
+ }
+ catch (NoSuchMethodException e) {
+ throw new AssertionFailure( "Unable to call constructor org.hibernate.reflection.java.JavaAnnotationReader(AnnotatedElement)", e );
+ }
+
+ try {
+ Class readerClass = ReflectHelper.classForName( "org.hibernate.reflection.java.EJB3OverridenAnnotationReader");
+ annotationReaderConstructors[1] = readerClass.getConstructor( AnnotatedElement.class, XMLContext.class );
+ }
+ catch (ClassNotFoundException e) {
+ throw new AssertionFailure( "Unable to load org.hibernate.reflection.java.EJB3OverridenAnnotationReader", e );
+ }
+ catch (NoSuchMethodException e) {
+ throw new AssertionFailure( "Unable to call constructor org.hibernate.reflection.java.EJB3OverridenAnnotationReader(AnnotatedElement, XMLContext)", e );
+ }
+ }
+
+ private static class TypeKey extends Pair<Type, TypeEnvironment> {
TypeKey(Type t, TypeEnvironment context) {
super( t, context );
}
Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/reflection/java/xml/XMLContext.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/reflection/java/xml/XMLContext.java 2006-10-24 22:55:36 UTC (rev 10649)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/reflection/java/xml/XMLContext.java 2006-10-25 01:18:29 UTC (rev 10650)
@@ -22,12 +22,14 @@
private Map<String, Default> defaultsOverriding = new HashMap<String, Default>();
private List<Element> defaultElements = new ArrayList<Element>();
private List<String> defaultEntityListeners = new ArrayList<String>();
+ private boolean hasContext = false;
- /**
+ /**
* Add a document and return the list of added classes names
*/
public List<String> addDocument(Document doc) {
- List<String> addedClasses = new ArrayList<String>();
+ hasContext = true;
+ List<String> addedClasses = new ArrayList<String>();
Element root = doc.getRootElement();
//global defaults
Element metadata = root.element( "persistence-unit-metadata" );
@@ -163,7 +165,11 @@
return defaultElements;
}
- public static class Default {
+ public boolean hasContext() {
+ return hasContext;
+ }
+
+ public static class Default {
private String access;
private String packageName;
private String schema;
@@ -213,7 +219,7 @@
}
public boolean canUseJavaAnnotations() {
- return ! Boolean.TRUE.equals( metadataComplete );
+ return metadataComplete == null || ! metadataComplete.booleanValue();
}
protected void setMetadataComplete(Boolean metadataComplete) {
Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/validator/ClassValidator.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/validator/ClassValidator.java 2006-10-24 22:55:36 UTC (rev 10649)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/validator/ClassValidator.java 2006-10-25 01:18:29 UTC (rev 10650)
@@ -71,7 +71,7 @@
private transient ResourceBundle messageBundle;
private transient ResourceBundle defaultMessageBundle;
private transient boolean isUserProvidedResourceBundle;
- private transient ReflectionManager reflectionManager = new JavaXFactory();
+ private transient ReflectionManager reflectionManager;
private final transient Map<XClass, ClassValidator> childClassValidators;
private transient List<Validator> beanValidators;
@@ -102,7 +102,7 @@
* for message rendering on violation
*/
public ClassValidator(Class<T> beanClass, ResourceBundle resourceBundle) {
- this( beanClass, resourceBundle, null, new HashMap<XClass, ClassValidator>() );
+ this( beanClass, resourceBundle, null, new HashMap<XClass, ClassValidator>(), null );
}
/**
@@ -110,27 +110,34 @@
* for message rendering on violation
*/
public ClassValidator(Class<T> beanClass, MessageInterpolator interpolator) {
- this( beanClass, null, interpolator, new HashMap<XClass, ClassValidator>() );
+ this( beanClass, null, interpolator, new HashMap<XClass, ClassValidator>(), null );
}
- protected ClassValidator(
- Class<T> beanClass, ResourceBundle resourceBundle, MessageInterpolator interpolator, Map<XClass, ClassValidator> childClassValidators
- ) {
- XClass beanXClass = reflectionManager.toXClass( beanClass );
+ /**
+ * Not a public API
+ */
+ public ClassValidator(
+ Class<T> beanClass, ResourceBundle resourceBundle, MessageInterpolator interpolator,
+ Map<XClass, ClassValidator> childClassValidators, ReflectionManager reflectionManager
+ ) {
+ this.reflectionManager = reflectionManager != null ? reflectionManager : new JavaXFactory();
+ XClass beanXClass = this.reflectionManager.toXClass( beanClass );
this.beanClass = beanClass;
this.messageBundle = resourceBundle == null ?
getDefaultResourceBundle() :
resourceBundle;
this.defaultMessageBundle = ResourceBundle.getBundle( DEFAULT_VALIDATOR_MESSAGE );
this.userInterpolator = interpolator;
- this.childClassValidators = childClassValidators;
- initValidator( beanXClass, childClassValidators );
+ this.childClassValidators = childClassValidators != null ?
+ childClassValidators :
+ new HashMap<XClass, ClassValidator>();
+ initValidator( beanXClass, this.childClassValidators );
}
@SuppressWarnings("unchecked")
protected ClassValidator(
XClass beanXClass, ResourceBundle resourceBundle, MessageInterpolator userInterpolator,
- Map<XClass, ClassValidator> childClassValidators
+ Map<XClass, ClassValidator> childClassValidators, ReflectionManager reflectionManager
) {
this.beanClass = reflectionManager.toClass( beanXClass );
this.messageBundle = resourceBundle == null ?
@@ -242,7 +249,7 @@
clazz = member.getType();
}
if ( !childClassValidators.containsKey( clazz ) ) {
- new ClassValidator( clazz, messageBundle, userInterpolator, childClassValidators );
+ new ClassValidator( clazz, messageBundle, userInterpolator, childClassValidators, reflectionManager );
}
}
}
18 years, 1 month
- 1
- 0
Hibernate SVN: r10649 - trunk/Hibernate3/src/org/hibernate/impl
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2006-10-24 18:55:36 -0400 (Tue, 24 Oct 2006)
New Revision: 10649
Modified:
trunk/Hibernate3/src/org/hibernate/impl/SessionImpl.java
Log:
HHH-2174
Modified: trunk/Hibernate3/src/org/hibernate/impl/SessionImpl.java
===================================================================
--- trunk/Hibernate3/src/org/hibernate/impl/SessionImpl.java 2006-10-24 22:54:48 UTC (rev 10648)
+++ trunk/Hibernate3/src/org/hibernate/impl/SessionImpl.java 2006-10-24 22:55:36 UTC (rev 10649)
@@ -427,7 +427,7 @@
interceptor.afterTransactionCompletion(tx);
}
catch (Throwable t) {
- log.error("exception in interceptor beforeTransactionCompletion()", t);
+ log.error("exception in interceptor afterTransactionCompletion()", t);
}
}
if ( autoClear ) {
18 years, 1 month
- 1
- 0
Hibernate SVN: r10648 - branches/Branch_3_2/Hibernate3/src/org/hibernate/impl
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2006-10-24 18:54:48 -0400 (Tue, 24 Oct 2006)
New Revision: 10648
Modified:
branches/Branch_3_2/Hibernate3/src/org/hibernate/impl/SessionImpl.java
Log:
HHH-2174
Modified: branches/Branch_3_2/Hibernate3/src/org/hibernate/impl/SessionImpl.java
===================================================================
--- branches/Branch_3_2/Hibernate3/src/org/hibernate/impl/SessionImpl.java 2006-10-24 15:52:48 UTC (rev 10647)
+++ branches/Branch_3_2/Hibernate3/src/org/hibernate/impl/SessionImpl.java 2006-10-24 22:54:48 UTC (rev 10648)
@@ -427,7 +427,7 @@
interceptor.afterTransactionCompletion(tx);
}
catch (Throwable t) {
- log.error("exception in interceptor beforeTransactionCompletion()", t);
+ log.error("exception in interceptor afterTransactionCompletion()", t);
}
}
if ( autoClear ) {
18 years, 1 month
- 1
- 0
Hibernate SVN: r10647 - in trunk/Hibernate3/test/org/hibernate/test: hql legacy
by hibernate-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2006-10-24 11:52:48 -0400 (Tue, 24 Oct 2006)
New Revision: 10647
Modified:
trunk/Hibernate3/test/org/hibernate/test/hql/FooBarCopy.hbm.xml
trunk/Hibernate3/test/org/hibernate/test/legacy/Baz.hbm.xml
trunk/Hibernate3/test/org/hibernate/test/legacy/FooBar.hbm.xml
Log:
Make Ingres 2006 happy by not having $ in the start of a table nor column name.
(merged from 3.2 branch)
Modified: trunk/Hibernate3/test/org/hibernate/test/hql/FooBarCopy.hbm.xml
===================================================================
--- trunk/Hibernate3/test/org/hibernate/test/hql/FooBarCopy.hbm.xml 2006-10-24 15:13:50 UTC (rev 10646)
+++ trunk/Hibernate3/test/org/hibernate/test/hql/FooBarCopy.hbm.xml 2006-10-24 15:52:48 UTC (rev 10647)
@@ -23,7 +23,7 @@
</generator>
</id>
- <discriminator column="`$foo_subclass^1234`" type="character" force="true"/>
+ <discriminator column="`^foo_subclass$1234`" type="character" force="true"/>
<version name="version"/>
<many-to-one name="foo" class="Foo">
Modified: trunk/Hibernate3/test/org/hibernate/test/legacy/Baz.hbm.xml
===================================================================
--- trunk/Hibernate3/test/org/hibernate/test/legacy/Baz.hbm.xml 2006-10-24 15:13:50 UTC (rev 10646)
+++ trunk/Hibernate3/test/org/hibernate/test/legacy/Baz.hbm.xml 2006-10-24 15:52:48 UTC (rev 10647)
@@ -60,7 +60,7 @@
<index column="j"/>
<element column="the_time" type="time"/>
</array>
- <bag name="bag" order-by="`name!`" table="`$%^^bxaxg`">
+ <bag name="bag" order-by="`name!`" table="`^%$^bxaxg`">
<key>
<column name="`baz_id$`" length="16"/>
</key>
Modified: trunk/Hibernate3/test/org/hibernate/test/legacy/FooBar.hbm.xml
===================================================================
--- trunk/Hibernate3/test/org/hibernate/test/legacy/FooBar.hbm.xml 2006-10-24 15:13:50 UTC (rev 10646)
+++ trunk/Hibernate3/test/org/hibernate/test/legacy/FooBar.hbm.xml 2006-10-24 15:52:48 UTC (rev 10647)
@@ -25,7 +25,7 @@
<param name="seperator">:</param>
</generator>
</id>
- <discriminator column="`$foo_subclass^1234`" type="character" force="true"/>
+ <discriminator column="`^foo_subclass$1234`" type="character" force="true"/>
<version name="version"/>
<!--<version name="versionCalendar" type="calendar"/>-->
<!--<timestamp name="versionTimestamp"/>-->
18 years, 1 month
- 1
- 0
Hibernate SVN: r10646 - in branches/Branch_3_2/Hibernate3/test/org/hibernate/test: hql legacy
by hibernate-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2006-10-24 11:13:50 -0400 (Tue, 24 Oct 2006)
New Revision: 10646
Modified:
branches/Branch_3_2/Hibernate3/test/org/hibernate/test/hql/FooBarCopy.hbm.xml
branches/Branch_3_2/Hibernate3/test/org/hibernate/test/legacy/Baz.hbm.xml
branches/Branch_3_2/Hibernate3/test/org/hibernate/test/legacy/FooBar.hbm.xml
Log:
Make Ingres 2006 happy by not having $ in the start of a table nor column name.
Modified: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/hql/FooBarCopy.hbm.xml
===================================================================
--- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/hql/FooBarCopy.hbm.xml 2006-10-24 14:32:42 UTC (rev 10645)
+++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/hql/FooBarCopy.hbm.xml 2006-10-24 15:13:50 UTC (rev 10646)
@@ -23,7 +23,7 @@
</generator>
</id>
- <discriminator column="`$foo_subclass^1234`" type="character" force="true"/>
+ <discriminator column="`^foo_subclass$1234`" type="character" force="true"/>
<version name="version"/>
<many-to-one name="foo" class="Foo">
Modified: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/legacy/Baz.hbm.xml
===================================================================
--- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/legacy/Baz.hbm.xml 2006-10-24 14:32:42 UTC (rev 10645)
+++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/legacy/Baz.hbm.xml 2006-10-24 15:13:50 UTC (rev 10646)
@@ -60,7 +60,7 @@
<index column="j"/>
<element column="the_time" type="time"/>
</array>
- <bag name="bag" order-by="`name!`" table="`$%^^bxaxg`">
+ <bag name="bag" order-by="`name!`" table="`^%$^bxaxg`">
<key>
<column name="`baz_id$`" length="16"/>
</key>
Modified: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/legacy/FooBar.hbm.xml
===================================================================
--- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/legacy/FooBar.hbm.xml 2006-10-24 14:32:42 UTC (rev 10645)
+++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/legacy/FooBar.hbm.xml 2006-10-24 15:13:50 UTC (rev 10646)
@@ -25,7 +25,7 @@
<param name="seperator">:</param>
</generator>
</id>
- <discriminator column="`$foo_subclass^1234`" type="character" force="true"/>
+ <discriminator column="`^foo_subclass$1234`" type="character" force="true"/>
<version name="version"/>
<!--<version name="versionCalendar" type="calendar"/>-->
<!--<timestamp name="versionTimestamp"/>-->
18 years, 1 month
- 1
- 0
Hibernate SVN: r10645 - branches/Branch_3_2/HibernateExt/tools/src/templates/doc/entities
by hibernate-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2006-10-24 10:32:42 -0400 (Tue, 24 Oct 2006)
New Revision: 10645
Modified:
branches/Branch_3_2/HibernateExt/tools/src/templates/doc/entities/entity.ftl
branches/Branch_3_2/HibernateExt/tools/src/templates/doc/entities/package-summary.ftl
Log:
HBX-790 Excessive 's imparing entity table layout
Modified: branches/Branch_3_2/HibernateExt/tools/src/templates/doc/entities/entity.ftl
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/templates/doc/entities/entity.ftl 2006-10-24 11:31:35 UTC (rev 10644)
+++ branches/Branch_3_2/HibernateExt/tools/src/templates/doc/entities/entity.ftl 2006-10-24 14:32:42 UTC (rev 10645)
@@ -85,19 +85,19 @@
<TD WIDTH="14%" <#if (rowspan>0)>ROWSPAN="${rowspan}"</#if>>
<#if dochelper.getComponentPOJO(property)?exists>
-
<A HREF='${docFileManager.getRef(docFile, docFileManager.getEntityDocFileByDeclarationName(dochelper.getComponentPOJO(property)))}' TARGET="generalFrame">
- ${compoclass.getJavaTypeName(property, jdk5)}
+ ${compoclass.getJavaTypeName(property, jdk5)?default(" ")}
</A>
<#else>
- ${compoclass.getJavaTypeName(property, jdk5)}
- </#if>
+ ${compoclass.getJavaTypeName(property, jdk5)?default(" ")}
+ </#if>
</TD>
<TD WIDTH="44%" <#if (rowspan>0)>ROWSPAN="${rowspan}"</#if>>
-
<#if compoclass.hasFieldJavaDoc(property)?exists>
- ${compoclass.getFieldDescription(property)}
+ ${compoclass.getFieldDescription(property)?default(" ")}
+ <#else>
+
</#if>
</TD>
</TR>
@@ -125,12 +125,13 @@
Column
</TD>
<TD WIDTH="14%">
- ${class.getJavaTypeName(propertyIdentifier, jdk5)}
+ ${class.getJavaTypeName(propertyIdentifier, jdk5)?default(" ")}
</TD>
<TD WIDTH="58%">
-
<#if class.hasFieldJavaDoc(propertyIdentifier)>
- ${class.getFieldDescription(propertyIdentifier)}
+ ${class.getFieldDescription(propertyIdentifier)?default(" ")}
+ <#else>
+
</#if>
</TD>
</TR>
@@ -204,19 +205,19 @@
<TD WIDTH="14%" <#if (rowspan>0)>ROWSPAN="${rowspan}"</#if>>
<#if dochelper.getComponentPOJO(property)?exists>
-
<A HREF='${docFileManager.getRef(docFile, docFileManager.getEntityDocFileByDeclarationName(dochelper.getComponentPOJO(property)))}' TARGET="generalFrame">
- ${class.getJavaTypeName(property, jdk5)}
+ ${class.getJavaTypeName(property, jdk5)?default(" ")}
</A>
<#else>
- ${class.getJavaTypeName(property, jdk5)}
+ ${class.getJavaTypeName(property, jdk5)?default(" ")}
</#if>
</TD>
<TD WIDTH="44%" <#if (rowspan>0)>ROWSPAN="${rowspan}"</#if>>
-
<#if class.hasFieldJavaDoc(property)>
- ${class.getFieldDescription(property)}
+ ${class.getFieldDescription(property)?default(" ")}
+ <#else>
+
</#if>
</TD>
</TR>
Modified: branches/Branch_3_2/HibernateExt/tools/src/templates/doc/entities/package-summary.ftl
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/templates/doc/entities/package-summary.ftl 2006-10-24 11:31:35 UTC (rev 10644)
+++ branches/Branch_3_2/HibernateExt/tools/src/templates/doc/entities/package-summary.ftl 2006-10-24 14:32:42 UTC (rev 10645)
@@ -30,7 +30,7 @@
</A>
</TD>
<TD WIDTH="70%">
- ${class.getMetaAsString("class-description")}
+ ${class.getMetaAsString("class-description")?default(" ")}
</TD>
</TR>
</#foreach>
18 years, 1 month
- 1
- 0
Hibernate SVN: r10644 - in branches/Branch_3_2/HibernateExt/tools/src/templates/doc: . entities tables
by hibernate-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2006-10-24 07:31:35 -0400 (Tue, 24 Oct 2006)
New Revision: 10644
Modified:
branches/Branch_3_2/HibernateExt/tools/src/templates/doc/entities/allEntity-list.ftl
branches/Branch_3_2/HibernateExt/tools/src/templates/doc/entities/entity.ftl
branches/Branch_3_2/HibernateExt/tools/src/templates/doc/entities/index.ftl
branches/Branch_3_2/HibernateExt/tools/src/templates/doc/entities/package-list.ftl
branches/Branch_3_2/HibernateExt/tools/src/templates/doc/entities/package-summary.ftl
branches/Branch_3_2/HibernateExt/tools/src/templates/doc/entities/perPackageEntity-list.ftl
branches/Branch_3_2/HibernateExt/tools/src/templates/doc/entities/summary.ftl
branches/Branch_3_2/HibernateExt/tools/src/templates/doc/header.html
branches/Branch_3_2/HibernateExt/tools/src/templates/doc/index.html
branches/Branch_3_2/HibernateExt/tools/src/templates/doc/tables/index.ftl
branches/Branch_3_2/HibernateExt/tools/src/templates/doc/tables/schema-list.ftl
branches/Branch_3_2/HibernateExt/tools/src/templates/doc/tables/schema-summary.ftl
branches/Branch_3_2/HibernateExt/tools/src/templates/doc/tables/summary.ftl
branches/Branch_3_2/HibernateExt/tools/src/templates/doc/tables/table-list.ftl
branches/Branch_3_2/HibernateExt/tools/src/templates/doc/tables/table.ftl
Log:
HBX-789 Reformat hbm2doc templates
Modified: branches/Branch_3_2/HibernateExt/tools/src/templates/doc/entities/allEntity-list.ftl
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/templates/doc/entities/allEntity-list.ftl 2006-10-24 10:50:28 UTC (rev 10643)
+++ branches/Branch_3_2/HibernateExt/tools/src/templates/doc/entities/allEntity-list.ftl 2006-10-24 11:31:35 UTC (rev 10644)
@@ -1,36 +1,30 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<HTML>
+ <HEAD>
+ <TITLE>Hibernate Mappings - Entity List</TITLE>
+ <LINK REL="stylesheet" TYPE="text/css" HREF="${docFileManager.getRef(docFile, docFileManager.getCssStylesDocFile())}" TITLE="Style"/>
+ </HEAD>
+ <BODY>
-<HEAD>
+ <TABLE BORDER="0" WIDTH="100%" SUMMARY="">
+ <TR>
+ <TD NOWRAP>
+ <FONT CLASS="ListTitleFont">
+ ${title}
+ </FONT>
+ <BR>
+ </TD>
+ </TR>
+ <TR>
+ <TD>
+ <#foreach class in classList>
+ <A HREF='${docFileManager.getRef(docFile, docFileManager.getEntityDocFile(class))}' TARGET="generalFrame">${class.declarationName}</A>
+ <BR>
+ </#foreach>
+ </TD>
+ </TR>
+ </TABLE>
-<TITLE>Hibernate Mappings - Entity List</TITLE>
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="${docFileManager.getRef(docFile, docFileManager.getCssStylesDocFile())}" TITLE="Style">
-
-</HEAD>
-
-<BODY>
-
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
- <TR>
- <TD NOWRAP>
- <FONT CLASS="ListTitleFont">
- ${title}
- </FONT>
- <BR>
- </TD>
- </TR>
- <TR>
- <TD>
-<#foreach class in classList>
- <A HREF='${docFileManager.getRef(docFile, docFileManager.getEntityDocFile(class))}' TARGET="generalFrame">${class.declarationName}</A>
- <BR>
-</#foreach>
- </TD>
- </TR>
-</TABLE>
-
-</BODY>
-
-</HTML>
\ No newline at end of file
+ </BODY>
+</HTML>
Modified: branches/Branch_3_2/HibernateExt/tools/src/templates/doc/entities/entity.ftl
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/templates/doc/entities/entity.ftl 2006-10-24 10:50:28 UTC (rev 10643)
+++ branches/Branch_3_2/HibernateExt/tools/src/templates/doc/entities/entity.ftl 2006-10-24 11:31:35 UTC (rev 10644)
@@ -1,231 +1,241 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<HTML>
+ <HEAD>
+ <TITLE>Hibernate Mappings - Entity Info</TITLE>
+ <LINK REL ="stylesheet" TYPE="text/css" HREF="${docFileManager.getRef(docFile, docFileManager.getCssStylesDocFile())}" TITLE="Style"/>
+ </HEAD>
+ <BODY>
-<HEAD>
+ <H4>${class.packageName}</H4>
+ <H3>Entity : ${class.getShortName()}</H3>
+ <#if class.isInterface()>
+ Interface Name :
+ <#else>
+ Class Name :
+ </#if>
+ ${class.qualifiedDeclarationName}
+ <BR>
+ <#if class.getMetaAsString("class-description")?has_content>
+ <HR>
+ <BR>
+ ${class.getMetaAsString("class-description")}
+ <BR>
+ </#if>
+ <HR>
-<TITLE>Hibernate Mappings - Entity Info</TITLE>
+ <#if class.hasIdentifierProperty()>
+ <#assign propertyIdentifier = class.getIdentifierProperty()>
+ <P>
+ <A NAME="identifier_summary"></A>
+ <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0">
+ <THEAD>
+ <TR>
+ <TH COLSPAN="9" CLASS="MainTableHeading">
+ Identifier Summary
+ </TH>
+ </TR>
+ <TR>
+ <TH WIDTH="14%">
+ Name
+ </TH>
+ <TH WIDTH="14%">
+ Column
+ </TH>
+ <TH WIDTH="14%">
+ Type
+ </TH>
+ <TH WIDTH="58%">
+ Description
+ </TH>
+ </TR>
+ </THEAD>
- <LINK REL ="stylesheet" TYPE="text/css" HREF="${docFileManager.getRef(docFile, docFileManager.getCssStylesDocFile())}" TITLE="Style">
-
-
-</HEAD>
-
-<BODY>
-
-<H4>${class.packageName}</H4>
-<H3>Entity : ${class.getShortName()} </H3>
-
-<#if class.isInterface()>Interface Name :
-<#else>Class Name :
-</#if>
-${class.qualifiedDeclarationName}
-<BR>
-<#if class.getMetaAsString("class-description")?has_content><HR>
-<BR>
- ${class.getMetaAsString("class-description")}
-<BR>
-</#if><HR>
-
-<#if class.hasIdentifierProperty()><#assign propertyIdentifier = class.getIdentifierProperty()><P>
-<A NAME="identifier_summary"></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0">
- <THEAD>
- <TR>
- <TH COLSPAN="9" CLASS="MainTableHeading">
- Identifier Summary
- </TH>
- </TR>
- <TR>
- <TH WIDTH="14%">
- Name
- </TH>
- <TH WIDTH="14%">
- Column
- </TH>
- <TH WIDTH="14%">
- Type
- </TH>
- <TH WIDTH="58%">
- Description
- </TH>
- </TR>
- </THEAD>
+ <TBODY>
+ <#if dochelper.getComponentPOJO(propertyIdentifier)?exists>
+ <#assign compoclass = dochelper.getComponentPOJO(propertyIdentifier)>
+ <#foreach property in compoclass.allPropertiesIterator>
+ <#assign columnIterator = property.getValue().columnIterator>
+ <#assign rowspan = property.getValue().getColumnSpan()>
+ <TR>
+ <TD WIDTH="14%" <#if (rowspan>0)>ROWSPAN="${rowspan}"</#if>>
+ <A HREF='#field_summary'>
+ ${property.name}
+ </A>
+ </TD>
-<#if dochelper.getComponentPOJO(propertyIdentifier)?exists>
- <#assign compoclass = dochelper.getComponentPOJO(propertyIdentifier)>
- <#foreach property in compoclass.allPropertiesIterator>
- <#assign columnIterator = property.getValue().columnIterator>
- <#assign rowspan = property.getValue().getColumnSpan()>
- <TR>
- <TD WIDTH="14%" <#if (rowspan>0)>ROWSPAN="${rowspan}"</#if>>
- <A HREF='#field_summary'>
- ${property.name}
- </A>
- </TD>
-
+ <#if (rowspan>0)>
+ <#assign column = columnIterator.next()>
+ <#if column.isFormula()>
+ <TD WIDTH="14%">
+
+ </TD>
+ <#else>
+ <TD WIDTH="14%">
+ <A HREF='#property_summary'>
+ ${column.getName()}
+ </A>
+ </TD>
+ </#if>
+ <#else>
+ <TD WIDTH="14%">
+
+ </TD>
+ </#if>
+
+ <TD WIDTH="14%" <#if (rowspan>0)>ROWSPAN="${rowspan}"</#if>>
+ <#if dochelper.getComponentPOJO(property)?exists>
+
+ <A HREF='${docFileManager.getRef(docFile, docFileManager.getEntityDocFileByDeclarationName(dochelper.getComponentPOJO(property)))}' TARGET="generalFrame">
+ ${compoclass.getJavaTypeName(property, jdk5)}
+ </A>
+ <#else>
+ ${compoclass.getJavaTypeName(property, jdk5)}
+ </#if>
+ </TD>
+
+ <TD WIDTH="44%" <#if (rowspan>0)>ROWSPAN="${rowspan}"</#if>>
+
+ <#if compoclass.hasFieldJavaDoc(property)?exists>
+ ${compoclass.getFieldDescription(property)}
+ </#if>
+ </TD>
+ </TR>
+
+ <#if (rowspan>1)>
+ <#foreach column in columnIterator>
+ <TR>
+ <TD>
+ <A HREF='#property_summary'>
+ ${column.name}
+ </A>
+ </TD>
+ </TR>
+ </#foreach>
+ </#if>
+ </#foreach>
+ <#else>
+ <TR>
+ <TD WIDTH="14%">
+ <A HREF='#field_summary'>
+ ${propertyIdentifier.name}
+ </A>
+ </TD>
+ <TD WIDTH="14%">
+ Column
+ </TD>
+ <TD WIDTH="14%">
+ ${class.getJavaTypeName(propertyIdentifier, jdk5)}
+ </TD>
+ <TD WIDTH="58%">
+
+ <#if class.hasFieldJavaDoc(propertyIdentifier)>
+ ${class.getFieldDescription(propertyIdentifier)}
+ </#if>
+ </TD>
+ </TR>
+ </#if>
+ </TBODY>
+ </TABLE>
+ </P>
+ </#if>
- <#if (rowspan>0)>
- <#assign column = columnIterator.next()>
- <#if column.isFormula()>
- <TD WIDTH="14%" >
-
- </TD>
- <#else>
- <TD WIDTH="14%" >
- <A HREF='#property_summary'>
- ${column.getName()}
- </A>
- </TD>
- </#if>
+ <P>
+ <A NAME="property_summary"></A>
+ <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0">
+ <THEAD>
+ <TR>
+ <TH COLSPAN="9" CLASS="MainTableHeading">
+ Property Summary
+ </TH>
+ </TR>
+ <TR>
+ <TH WIDTH="14%">
+ Name
+ </TH>
+ <TH WIDTH="14%">
+ Column
+ </TH>
+ <TH WIDTH="14%">
+ Access
+ </TH>
+ <TH WIDTH="14%">
+ Type
+ </TH>
+ <TH WIDTH="44%">
+ Description
+ </TH>
+ </TR>
+ </THEAD>
+ <TBODY>
- <#else>
- <TD WIDTH="14%" >
-
- </TD>
- </#if>
- <TD WIDTH="14%" <#if (rowspan>0)>ROWSPAN="${rowspan}"</#if>>
-
- <#if dochelper.getComponentPOJO(property)?exists>
-
- <A HREF='${docFileManager.getRef(docFile, docFileManager.getEntityDocFileByDeclarationName(dochelper.getComponentPOJO(property)))}' TARGET="generalFrame">
- ${compoclass.getJavaTypeName(property, jdk5)}
- </A>
- <#else>
- ${compoclass.getJavaTypeName(property, jdk5)}
- </#if>
- </TD>
+ <#foreach property in class.allPropertiesIterator>
+ <#assign columnIterator = property.getValue().columnIterator>
+ <#assign rowspan = property.getValue().getColumnSpan()>
+ <TR>
+ <TD WIDTH="14%" <#if (rowspan>0)>ROWSPAN="${rowspan}"</#if>>
+ <A HREF='#field_summary'>
+ ${property.name}
+ </A>
+ </TD>
- <TD WIDTH="44%" <#if (rowspan>0)>ROWSPAN="${rowspan}"</#if>>
-
- <#if compoclass.hasFieldJavaDoc(property)?exists>
- ${compoclass.getFieldDescription(property)}
- </#if>
- </TD>
- </TR>
- <#if (rowspan>1)>
- <#foreach column in columnIterator>
- <TR>
- <TD>
- <A HREF='#property_summary'>
- ${column.name}
- </A>
- </TD>
- </TR>
- </#foreach>
- </#if>
- </#foreach>
-<#else> <TR>
- <TD WIDTH="14%">
- <A HREF='#field_summary'>
- ${propertyIdentifier.name}
- </A>
- </TD>
- <TD WIDTH="14%">
- Column
- </TD>
- <TD WIDTH="14%">
- ${class.getJavaTypeName(propertyIdentifier, jdk5)}
- </TD>
- <TD WIDTH="58%">
-
- <#if class.hasFieldJavaDoc(propertyIdentifier)>
- ${class.getFieldDescription(propertyIdentifier)}
- </#if> </TD>
-
- </TR>
-</#if> <TBODY>
+ <#if (rowspan>0)>
+ <#assign column = columnIterator.next()>
+ <#if column.isFormula()>
+ <TD WIDTH="14%">
+
+ </TD>
+ <#else>
+ <TD WIDTH="14%">
+ <A HREF='#property_summary'>
+ ${column.getName()}
+ </A>
+ </TD>
+ </#if>
+ <#else>
+ <TD WIDTH="14%">
+
+ </TD>
+ </#if>
- </TBODY>
-</TABLE>
-</#if>
-<P>
-<A NAME="property_summary"></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0">
- <THEAD>
- <TR>
- <TH COLSPAN="9" CLASS="MainTableHeading">
- Property Summary
- </TH>
- </TR>
- <TR>
- <TH WIDTH="14%">
- Name
- </TH>
- <TH WIDTH="14%">
- Column
- </TH>
- <TH WIDTH="14%">
- Access
- </TH>
- <TH WIDTH="14%">
- Type
- </TH>
- <TH WIDTH="44%">
- Description
- </TH>
- </TR>
- </THEAD>
- <TBODY>
+ <TD WIDTH="14%" <#if (rowspan>0)>ROWSPAN="${rowspan}"</#if>>
+ ${property.getPropertyAccessorName()} (<A HREF='#property_summary'>get</A> / <A HREF='#property_summary'>set</A>)
+ </TD>
-<#foreach property in class.allPropertiesIterator>
-<#assign columnIterator = property.getValue().columnIterator>
-<#assign rowspan = property.getValue().getColumnSpan()>
- <TR>
- <TD WIDTH="14%" <#if (rowspan>0)>ROWSPAN="${rowspan}"</#if>>
- <A HREF='#field_summary'>
- ${property.name}
- </A>
- </TD>
-
+ <TD WIDTH="14%" <#if (rowspan>0)>ROWSPAN="${rowspan}"</#if>>
+ <#if dochelper.getComponentPOJO(property)?exists>
+
+ <A HREF='${docFileManager.getRef(docFile, docFileManager.getEntityDocFileByDeclarationName(dochelper.getComponentPOJO(property)))}' TARGET="generalFrame">
+ ${class.getJavaTypeName(property, jdk5)}
+ </A>
+ <#else>
+ ${class.getJavaTypeName(property, jdk5)}
+ </#if>
+ </TD>
-<#if (rowspan>0)>
-<#assign column = columnIterator.next()>
- <#if column.isFormula()> <TD WIDTH="14%" >
-
- </TD>
- <#else> <TD WIDTH="14%" >
- <A HREF='#property_summary'>
- ${column.getName()}
- </A>
- </TD>
- </#if>
-<#else> <TD WIDTH="14%" >
-
- </TD>
-
-</#if>
- <TD WIDTH="14%" <#if (rowspan>0)>ROWSPAN="${rowspan}"</#if>>
- ${property.getPropertyAccessorName()} (<A HREF='#property_summary'>get</A> / <A HREF='#property_summary'>set</A>)
- </TD>
-
- <TD WIDTH="14%" <#if (rowspan>0)>ROWSPAN="${rowspan}"</#if>>
-
-<#if dochelper.getComponentPOJO(property)?exists>
- <A HREF='${docFileManager.getRef(docFile, docFileManager.getEntityDocFileByDeclarationName(dochelper.getComponentPOJO(property)))}' TARGET="generalFrame">
- ${class.getJavaTypeName(property, jdk5)}
- </A>
-<#else> ${class.getJavaTypeName(property, jdk5)}
-</#if>
- </TD>
+ <TD WIDTH="44%" <#if (rowspan>0)>ROWSPAN="${rowspan}"</#if>>
+
+ <#if class.hasFieldJavaDoc(property)>
+ ${class.getFieldDescription(property)}
+ </#if>
+ </TD>
+ </TR>
+ <#if (rowspan>1)>
+ <#foreach column in columnIterator>
+ <TR>
+ <TD>
+ <A HREF='#property_summary'>
+ ${column.name}
+ </A>
+ </TD>
+ </TR>
+ </#foreach>
+ </#if>
+ </#foreach>
- <TD WIDTH="44%" <#if (rowspan>0)>ROWSPAN="${rowspan}"</#if>>
-
-<#if class.hasFieldJavaDoc(property)>${class.getFieldDescription(property)}
-</#if> </TD>
- </TR>
-<#if (rowspan>1)><#foreach column in columnIterator> <TR>
- <TD>
- <A HREF='#property_summary'>
- ${column.name}
- </A>
- </TD>
- </TR>
-</#foreach></#if></#foreach>
- </TBODY>
-</TABLE>
-<P>
-
-</BODY>
-
-</HTML>
\ No newline at end of file
+ </TBODY>
+ </TABLE>
+ </P>
+
+ </BODY>
+</HTML>
Modified: branches/Branch_3_2/HibernateExt/tools/src/templates/doc/entities/index.ftl
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/templates/doc/entities/index.ftl 2006-10-24 10:50:28 UTC (rev 10643)
+++ branches/Branch_3_2/HibernateExt/tools/src/templates/doc/entities/index.ftl 2006-10-24 11:31:35 UTC (rev 10644)
@@ -1,25 +1,21 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<HTML>
+ <HEAD>
+ <TITLE>Hibernate Mappings - Entity Mapping Information</TITLE>
+ <LINK REL ="stylesheet" TYPE="text/css" HREF="${docFileManager.getRef(docFile, docFileManager.getCssStylesDocFile())}" TITLE="Style"/>
+ </HEAD>
-<HEAD>
-
-<TITLE>Hibernate Mappings - Entity Mapping Information</TITLE>
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="${docFileManager.getRef(docFile, docFileManager.getCssStylesDocFile())}" TITLE="Style">
-
-</HEAD>
-
-<FRAMESET cols="20%,80%">
- <FRAMESET rows="30%,70%">
- <FRAME src="allpackages.html" name="packagesFrame" title="All Packages">
- <FRAME src="allentities.html" name="entitiesFrame" title="All Entities">
+ <FRAMESET cols="20%,80%">
+ <FRAMESET rows="30%,70%">
+ <FRAME src="allpackages.html" name="packagesFrame" title="All Packages"/>
+ <FRAME src="allentities.html" name="entitiesFrame" title="All Entities"/>
+ </FRAMESET>
+ <FRAME src="summary.html" name="generalFrame" title="Entity descriptions" scrolling="yes"/>
+ <NOFRAMES>
+ <H2>Frame Alert</H2>
+ This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web browser.
+ </NOFRAMES>
</FRAMESET>
- <FRAME src="summary.html" name="generalFrame" title="Entity descriptions" scrolling="yes">
- <NOFRAMES>
- <H2>Frame Alert</H2>
- This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web browser.
- </NOFRAMES>
-</FRAMESET>
-</HTML>
\ No newline at end of file
+</HTML>
Modified: branches/Branch_3_2/HibernateExt/tools/src/templates/doc/entities/package-list.ftl
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/templates/doc/entities/package-list.ftl 2006-10-24 10:50:28 UTC (rev 10643)
+++ branches/Branch_3_2/HibernateExt/tools/src/templates/doc/entities/package-list.ftl 2006-10-24 11:31:35 UTC (rev 10644)
@@ -1,37 +1,32 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<HTML>
+ <HEAD>
+ <TITLE>Hibernate Mappings - Package List</TITLE>
+ <LINK REL="stylesheet" TYPE="text/css" HREF="${docFileManager.getRef(docFile, docFileManager.getCssStylesDocFile())}" TITLE="Style"/>
+ </HEAD>
+ <BODY>
-<HEAD>
-
-<TITLE>Hibernate Mappings - Package List</TITLE>
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="${docFileManager.getRef(docFile, docFileManager.getCssStylesDocFile())}" TITLE="Style">
-
-</HEAD>
-
-<BODY>
-
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
- <TR>
- <TD NOWRAP>
- <FONT CLASS="ListTitleFont">
- ${title}
- </FONT>
- <BR>
- </TD>
- </TR>
- <TR>
- <TD>
- <A HREF="${docFileManager.getRef(docFile, docFileManager.getAllEntitiesDocFile())}" TARGET="entitiesFrame">all entities</A>
- <BR>
-<#foreach package in packageList>
- <A HREF="${docFileManager.getRef(docFile, docFileManager.getPackageEntityListDocFile(package))}" TARGET="entitiesFrame">${package}</A>
- <BR>
-</#foreach> </TD>
- </TR>
-</TABLE>
-
-</BODY>
-
-</HTML>
\ No newline at end of file
+ <TABLE BORDER="0" WIDTH="100%" SUMMARY="">
+ <TR>
+ <TD NOWRAP>
+ <FONT CLASS="ListTitleFont">
+ ${title}
+ </FONT>
+ <BR>
+ </TD>
+ </TR>
+ <TR>
+ <TD>
+ <A HREF="${docFileManager.getRef(docFile, docFileManager.getAllEntitiesDocFile())}" TARGET="entitiesFrame">all entities</A>
+ <BR>
+ <#foreach package in packageList>
+ <A HREF="${docFileManager.getRef(docFile, docFileManager.getPackageEntityListDocFile(package))}" TARGET="entitiesFrame">${package}</A>
+ <BR>
+ </#foreach>
+ </TD>
+ </TR>
+ </TABLE>
+
+ </BODY>
+</HTML>
Modified: branches/Branch_3_2/HibernateExt/tools/src/templates/doc/entities/package-summary.ftl
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/templates/doc/entities/package-summary.ftl 2006-10-24 10:50:28 UTC (rev 10643)
+++ branches/Branch_3_2/HibernateExt/tools/src/templates/doc/entities/package-summary.ftl 2006-10-24 11:31:35 UTC (rev 10644)
@@ -1,48 +1,43 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<HTML>
+ <HEAD>
+ <TITLE>Hibernate Mappings - Entity Summary</TITLE>
+ <LINK REL="stylesheet" TYPE="text/css" HREF="${docFileManager.getRef(docFile, docFileManager.getCssStylesDocFile())}" TITLE="Style"/>
+ </HEAD>
+ <BODY>
-<HEAD>
+ <H1>Hibernate Mapping Documentation</H1>
-<TITLE>Hibernate Mappings - Entity Summary</TITLE>
+ <H2>Package ${package}</H2>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="${docFileManager.getRef(docFile, docFileManager.getCssStylesDocFile())}" TITLE="Style">
-
-</HEAD>
-
-<BODY>
-
-<H1>Hibernate Mapping Documentation</H1>
-
-<H2>Package ${package}</H2>
-
-<P>
-<#if (classList.size()>0)>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0">
- <THEAD>
- <TR>
- <TH COLSPAN="2" CLASS="MainTableHeading">
- Entities Summary
- </TH>
- </TR>
- </THEAD>
- <TBODY>
-<#foreach class in classList>
- <TR>
- <TD WIDTH="30%">
- <A HREF='${docFileManager.getRef(docFile, docFileManager.getEntityDocFile(class))}' TARGET="generalFrame">
- <B>${class.declarationName}</B>
- </A>
- </TD>
- <TD WIDTH="70%">
-
- ${class.getMetaAsString("class-description")}
-
- </TD>
-
- </TR>
-</#foreach>
- </TBODY>
-</TABLE>
-</#if>
-</BODY>
\ No newline at end of file
+ <P>
+ <#if (classList.size()>0)>
+ <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0">
+ <THEAD>
+ <TR>
+ <TH COLSPAN="2" CLASS="MainTableHeading">
+ Entities Summary
+ </TH>
+ </TR>
+ </THEAD>
+ <TBODY>
+ <#foreach class in classList>
+ <TR>
+ <TD WIDTH="30%">
+ <A HREF='${docFileManager.getRef(docFile, docFileManager.getEntityDocFile(class))}' TARGET="generalFrame">
+ <B>${class.declarationName}</B>
+ </A>
+ </TD>
+ <TD WIDTH="70%">
+ ${class.getMetaAsString("class-description")}
+ </TD>
+ </TR>
+ </#foreach>
+ </TBODY>
+ </TABLE>
+ </#if>
+ </P>
+
+ </BODY>
+</HTML>
Modified: branches/Branch_3_2/HibernateExt/tools/src/templates/doc/entities/perPackageEntity-list.ftl
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/templates/doc/entities/perPackageEntity-list.ftl 2006-10-24 10:50:28 UTC (rev 10643)
+++ branches/Branch_3_2/HibernateExt/tools/src/templates/doc/entities/perPackageEntity-list.ftl 2006-10-24 11:31:35 UTC (rev 10644)
@@ -1,42 +1,34 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<HTML>
+ <HEAD>
+ <TITLE>Hibernate Mappings - Entity List</TITLE>
+ <LINK REL="stylesheet" TYPE="text/css" HREF="${docFileManager.getRef(docFile, docFileManager.getCssStylesDocFile())}" TITLE="Style"/>
+ </HEAD>
+ <BODY>
-<HEAD>
+ <TABLE BORDER="0" WIDTH="100%" SUMMARY="">
+ <TR>
+ <TD NOWRAP>
+ <FONT CLASS="ListTitleFont">
+ <A HREF='${docFileManager.getRef(docFile, docFileManager.getPackageSummaryDocFile(title))}' TARGET="generalFrame">${title}</A>
+ </FONT>
+ <BR>
+ </TD>
+ </TR>
+ <#if (classList.size()>0)>
+ <TR>
+ <TD>
+ Entities
+ <BR>
+ <#foreach class in classList>
+ <A HREF='${docFileManager.getRef(docFile, docFileManager.getEntityDocFile(class))}' TARGET="generalFrame">${class.declarationName}</A>
+ <BR>
+ </#foreach>
+ </TD>
+ </TR>
+ </#if>
+ </TABLE>
-<TITLE>Hibernate Mappings - Entity List</TITLE>
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="${docFileManager.getRef(docFile, docFileManager.getCssStylesDocFile())}" TITLE="Style">
-
-</HEAD>
-
-<BODY>
-
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
- <TR>
- <TD NOWRAP>
- <FONT CLASS="ListTitleFont">
- <A HREF='${docFileManager.getRef(docFile, docFileManager.getPackageSummaryDocFile(title))}' TARGET="generalFrame">${title}</A>
- </FONT>
- <BR>
- </TD>
- </TR>
-<#if (classList.size()>0)>
- <TR>
- <TD>
- Entities
- <BR>
-<#foreach class in classList>
- <A HREF='${docFileManager.getRef(docFile, docFileManager.getEntityDocFile(class))}' TARGET="generalFrame">${class.declarationName}</A>
-
- <BR>
-</#foreach>
- </TD>
- </TR>
-</#if>
-
-</TABLE>
-
-</BODY>
-
-</HTML>
\ No newline at end of file
+ </BODY>
+</HTML>
Modified: branches/Branch_3_2/HibernateExt/tools/src/templates/doc/entities/summary.ftl
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/templates/doc/entities/summary.ftl 2006-10-24 10:50:28 UTC (rev 10643)
+++ branches/Branch_3_2/HibernateExt/tools/src/templates/doc/entities/summary.ftl 2006-10-24 11:31:35 UTC (rev 10644)
@@ -1,49 +1,43 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<HTML>
+ <HEAD>
+ <TITLE>Hibernate Mappings - Entity Summary</TITLE>
+ <LINK REL="stylesheet" TYPE="text/css" HREF="${docFileManager.getRef(docFile, docFileManager.getCssStylesDocFile())}" TITLE="Style"/>
+ </HEAD>
+ <BODY>
-<HEAD>
+ <H1>Hibernate Mapping Documentation</H1>
-<TITLE>Hibernate Mappings - Entity Summary</TITLE>
+ <#if graphsGenerated>
+ <p>
+ <img src="entitygraph.png" usemap="#entitygraph"/>
+ <map name="entitygraph">
+ ${entitygrapharea}
+ </map>
+ </p>
+ </#if>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="${docFileManager.getRef(docFile, docFileManager.getCssStylesDocFile())}" TITLE="Style">
+ <H2>List of Packages</H2>
-</HEAD>
+ <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0">
+ <THEAD>
+ <TR>
+ <TH COLSPAN="2" CLASS="MainTableHeading">
+ Packages
+ </TH>
+ </TR>
+ </THEAD>
+ <TBODY>
+ <#foreach package in packageList>
+ <TR>
+ <TD>
+ <A HREF='${docFileManager.getRef(docFile, docFileManager.getPackageSummaryDocFile(package))}' TARGET="generalFrame"><B>${package}</B></A>
+ </TD>
+ </TR>
+ </#foreach>
+ </TBODY>
+ </TABLE>
-<BODY>
-
-<H1>Hibernate Mapping Documentation</H1>
-
-<#if graphsGenerated>
-<p>
- <img src="entitygraph.png" usemap="#entitygraph"/>
- <map name="entitygraph">
- ${entitygrapharea}
- </map>
-</p>
-</#if>
-
-<H2>List of Packages</H2>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0">
- <THEAD>
- <TR>
- <TH COLSPAN="2" CLASS="MainTableHeading">
- Packages
- </TH>
- </TR>
- </THEAD>
- <TBODY>
-<#foreach package in packageList>
- <TR>
- <TD>
-
- <A HREF='${docFileManager.getRef(docFile, docFileManager.getPackageSummaryDocFile(package))}' TARGET="generalFrame"><B>${package}</B></A>
- </TD>
- </TR>
-</#foreach>
- </TBODY>
-</TABLE>
-
-
-</BODY>
\ No newline at end of file
+ </BODY>
+</HTML>
Modified: branches/Branch_3_2/HibernateExt/tools/src/templates/doc/header.html
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/templates/doc/header.html 2006-10-24 10:50:28 UTC (rev 10643)
+++ branches/Branch_3_2/HibernateExt/tools/src/templates/doc/header.html 2006-10-24 11:31:35 UTC (rev 10644)
@@ -1,33 +1,27 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<HTML>
+ <HEAD>
+ <TITLE>Hibernate Mappings - Header</TITLE>
+ <LINK REL="stylesheet" TYPE="text/css" HREF="assets/doc-style.css" TITLE="Style"/>
+ </HEAD>
+ <BODY CLASS="HeaderBody">
-<HEAD>
+ <TABLE WIDTH="100%" HEIGHT="40px" CELLPADDING="0" CELLSPACING="0" CLASS="HeaderTable">
+ <TR>
+ <TD WIDTH="20%"">
+ <A HREF="tables/index.html" TARGET="mainFrame" CLASS="HeaderLink">TABLES</A>
+ </TD>
+ <TD WIDTH="20%">
+ <A HREF="entities/index.html" TARGET="mainFrame" CLASS="HeaderLink">ENTITIES</A>
+ </TD>
+ <TD WIDTH="20%">
+ <A HREF="http://www.hibernate.org/" target="_blank">
+ <IMG SRC="assets/hibernate_logo.gif" BORDER="0" ALT="HIBERNATE"/>
+ </A>
+ </TD>
+ </TR>
+ </TABLE>
-<TITLE>Hibernate Mappings - Header</TITLE>
-
-<LINK REL="stylesheet" TYPE="text/css" HREF="assets/doc-style.css" TITLE="Style">
-
-</HEAD>
-
-<BODY CLASS="HeaderBody">
-
-<TABLE WIDTH="100%" HEIGHT="40px" CELLPADDING="0" CELLSPACING="0" CLASS="HeaderTable">
- <TR>
- <TD WIDTH="20%"">
- <A HREF="tables/index.html" TARGET="mainFrame" CLASS="HeaderLink">TABLES</A>
- </TD>
- <TD WIDTH="20%">
- <A HREF="entities/index.html" TARGET="mainFrame" CLASS="HeaderLink">ENTITIES</A>
- </TD>
- <TD WIDTH="20%">
- <A HREF="http://www.hibernate.org/" target="_blank">
- <IMG SRC="assets/hibernate_logo.gif" BORDER="0" ALT="HIBERNATE"/>
- </A>
- </TD>
- </TR>
-</TABLE>
-
-</BODY>
-
+ </BODY>
</HTML>
\ No newline at end of file
Modified: branches/Branch_3_2/HibernateExt/tools/src/templates/doc/index.html
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/templates/doc/index.html 2006-10-24 10:50:28 UTC (rev 10643)
+++ branches/Branch_3_2/HibernateExt/tools/src/templates/doc/index.html 2006-10-24 11:31:35 UTC (rev 10644)
@@ -1,22 +1,18 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<HTML>
+ <HEAD>
+ <TITLE>Hibernate Mappings - Hibernate Mapping Information</TITLE>
+ <LINK REL="stylesheet" TYPE="text/css" HREF="assets/doc-style.css" TITLE="Style"/>
+ </HEAD>
-<HEAD>
+ <FRAMESET rows="50px,80%">
+ <FRAME src="header.html" name="headerFrame" title="Header"/>
+ <FRAME src="entities/index.html" name="mainFrame" title="Main"/>
+ <NOFRAMES>
+ <H2>Frame Alert</H2>
+ This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web browser.
+ </NOFRAMES>
+ </FRAMESET>
-<TITLE>Hibernate Mappings - Hibernate Mapping Information</TITLE>
-
-<LINK REL="stylesheet" TYPE="text/css" HREF="assets/doc-style.css" TITLE="Style">
-
-</HEAD>
-
-<FRAMESET rows="50px,80%">
- <FRAME src="header.html" name="headerFrame" title="Header">
- <FRAME src="entities/index.html" name="mainFrame" title="Main">
- <NOFRAMES>
- <H2>Frame Alert</H2>
- This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web browser.
- </NOFRAMES>
-</FRAMESET>
-
-</HTML>
\ No newline at end of file
+</HTML>
Modified: branches/Branch_3_2/HibernateExt/tools/src/templates/doc/tables/index.ftl
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/templates/doc/tables/index.ftl 2006-10-24 10:50:28 UTC (rev 10643)
+++ branches/Branch_3_2/HibernateExt/tools/src/templates/doc/tables/index.ftl 2006-10-24 11:31:35 UTC (rev 10644)
@@ -1,25 +1,21 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<HTML>
+ <HEAD>
+ <TITLE>Hibernate Mappings - Table Mapping Information</TITLE>
+ <LINK REL="stylesheet" TYPE="text/css" HREF="${docFileManager.getRef(docFile, docFileManager.getCssStylesDocFile())}" TITLE="Style"/>
+ </HEAD>
-<HEAD>
-
-<TITLE>Hibernate Mappings - Table Mapping Information</TITLE>
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="${docFileManager.getRef(docFile, docFileManager.getCssStylesDocFile())}" TITLE="Style">
-
-</HEAD>
-
-<FRAMESET cols="20%,80%">
- <FRAMESET rows="30%,70%">
- <FRAME src="allschemas.html" name="schemasFrame" title="All Schemas">
- <FRAME src="alltables.html" name="tablesFrame" title="All Tables">
+ <FRAMESET cols="20%,80%">
+ <FRAMESET rows="30%,70%">
+ <FRAME src="allschemas.html" name="schemasFrame" title="All Schemas"/>
+ <FRAME src="alltables.html" name="tablesFrame" title="All Tables"/>
+ </FRAMESET>
+ <FRAME src="summary.html" name="generalFrame" title="Table descriptions" scrolling="yes"/>
+ <NOFRAMES>
+ <H2>Frame Alert</H2>
+ This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web browser.
+ </NOFRAMES>
</FRAMESET>
- <FRAME src="summary.html" name="generalFrame" title="Table descriptions" scrolling="yes">
- <NOFRAMES>
- <H2>Frame Alert</H2>
- This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web browser.
- </NOFRAMES>
-</FRAMESET>
-</HTML>
\ No newline at end of file
+</HTML>
Modified: branches/Branch_3_2/HibernateExt/tools/src/templates/doc/tables/schema-list.ftl
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/templates/doc/tables/schema-list.ftl 2006-10-24 10:50:28 UTC (rev 10643)
+++ branches/Branch_3_2/HibernateExt/tools/src/templates/doc/tables/schema-list.ftl 2006-10-24 11:31:35 UTC (rev 10644)
@@ -1,34 +1,28 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<HTML>
+ <HEAD>
+ <TITLE>Hibernate Mappings - Schema List</TITLE>
+ <LINK REL="stylesheet" TYPE="text/css" HREF="${docFileManager.getRef(docFile, docFileManager.getCssStylesDocFile())}" TITLE="Style"/>
+ </HEAD>
+ <BODY>
-<HEAD>
+ <TABLE BORDER="0" WIDTH="100%" SUMMARY="">
+ <TR>
+ <TD NOWRAP>
+ <FONT CLASS="ListTitleFont">
+ ${title}
+ </FONT>
+ <BR>
+ <A HREF="${docFileManager.getRef(docFile, docFileManager.getAllTablesDocFile())}" TARGET="tablesFrame">all tables</A>
+ <BR>
+ <#foreach schema in schemaList>
+ <A HREF="${docFileManager.getRef(docFile, docFileManager.getSchemaTableListDocFile(schema))}" TARGET="tablesFrame">${schema}</A>
+ <BR>
+ </#foreach>
+ </TD>
+ </TR>
+ </TABLE>
-<TITLE>Hibernate Mappings - Schema List</TITLE>
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="${docFileManager.getRef(docFile, docFileManager.getCssStylesDocFile())}" TITLE="Style">
-
-</HEAD>
-
-<BODY>
-
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
- <TR>
- <TD NOWRAP>
- <FONT CLASS="ListTitleFont">
- ${title}
- </FONT>
- <BR>
- <A HREF="${docFileManager.getRef(docFile, docFileManager.getAllTablesDocFile())}" TARGET="tablesFrame">all tables</A>
- <BR>
-<#foreach schema in schemaList>
- <A HREF="${docFileManager.getRef(docFile, docFileManager.getSchemaTableListDocFile(schema))}" TARGET="tablesFrame">${schema}</A>
- <BR>
-</#foreach>
- </TD>
- </TR>
-</TABLE>
-
-</BODY>
-
-</HTML>
\ No newline at end of file
+ </BODY>
+</HTML>
Modified: branches/Branch_3_2/HibernateExt/tools/src/templates/doc/tables/schema-summary.ftl
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/templates/doc/tables/schema-summary.ftl 2006-10-24 10:50:28 UTC (rev 10643)
+++ branches/Branch_3_2/HibernateExt/tools/src/templates/doc/tables/schema-summary.ftl 2006-10-24 11:31:35 UTC (rev 10644)
@@ -1,78 +1,75 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<HTML>
+ <HEAD>
+ <TITLE>Hibernate Mappings - Table Summary</TITLE>
+ <LINK REL="stylesheet" TYPE="text/css" HREF="${docFileManager.getRef(docFile, docFileManager.getCssStylesDocFile())}" TITLE="Style"/>
+ </HEAD>
+ <BODY>
-<HEAD>
+ <H1>Hibernate Mapping Documentation</H1>
-<TITLE>Hibernate Mappings - Table Summary</TITLE>
+ <H2>List of Tables for Schema: ${schema}</H2>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="${docFileManager.getRef(docFile, docFileManager.getCssStylesDocFile())}" TITLE="Style">
+ <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0">
+ <THEAD>
+ <TR>
+ <TH COLSPAN="2" CLASS="MainTableHeading">
+ Tables
+ </TH>
+ </TR>
+ </THEAD>
+
+ <TBODY>
+ <#foreach table in dochelper.tablesBySchema.get(schema)>
+ <TR>
+ <TD>
+ <A HREF='${docFileManager.getRef(docFile, docFileManager.getTableDocFile(table))}' TARGET="generalFrame">
+ <B>${table.name}</B>
+ </A>
+ </TD>
+ <TD>
+ <TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0">
+ <THEAD>
+ <TR>
+ <TH WIDTH="50%">
+ Name
+ </TH>
+ <TH WIDTH="30%">
+ SQL Type
+ </TH>
+ <TH WIDTH="15%">
+ Nullable
+ </TH>
+ <TH WIDTH="15%">
+ Unique
+ </TH>
+ </TR>
+ </THEAD>
+ <TBODY>
+ <#foreach column in table.columnIterator>
+ <TR>
+ <TD>
+ ${column.name}
+ </TD>
+ <TD>
+ ${dochelper.getSQLTypeName(column)}
+ </TD>
+ <TD ALIGN="CENTER">
+ ${column.nullable?string}
+ </TD>
+ <TD ALIGN="CENTER">
+ ${column.unique?string}
+ </TD>
+ </TR>
+ </#foreach>
+ </TBODY>
+ </TABLE>
+ </TD>
+ </TR>
+ </#foreach>
+ </TBODY>
+ </TABLE>
-</HEAD>
-
-<BODY>
-
-<H1>Hibernate Mapping Documentation</H1>
-
-<H2>List of Tables for Schema: ${schema}</H2>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0">
- <THEAD>
- <TR>
- <TH COLSPAN="2" CLASS="MainTableHeading">
- Tables
- </TH>
- </TR>
- </THEAD>
-<#foreach table in dochelper.tablesBySchema.get(schema)>
- <TBODY>
- <TR>
- <TD>
- <A HREF='${docFileManager.getRef(docFile, docFileManager.getTableDocFile(table))}' TARGET="generalFrame">
- <B>${table.name}</B>
- </A>
- </TD>
- <TD>
- <TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0">
- <THEAD>
- <TR>
- <TH WIDTH="50%">
- Name
- </TH>
- <TH WIDTH="30%">
- SQL Type
- </TH>
- <TH WIDTH="15%">
- Nullable
- </TH>
- <TH WIDTH="15%">
- Unique
- </TH>
- </TR>
- </THEAD>
- <TBODY>
-<#foreach column in table.columnIterator>
- <TR>
- <TD>
- ${column.name}
- </TD>
- <TD>
- ${dochelper.getSQLTypeName(column)}
- </TD>
- <TD ALIGN="CENTER">
- ${column.nullable?string}
- </TD>
- <TD ALIGN="CENTER">
- ${column.unique?string}
- </TD>
- </TR>
-</#foreach>
- </TBODY>
- </TABLE>
- </TD>
- </TR>
-</#foreach>
- </TBODY>
-</TABLE>
-
-</BODY>
\ No newline at end of file
+ </BODY>
+</HTML>
Modified: branches/Branch_3_2/HibernateExt/tools/src/templates/doc/tables/summary.ftl
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/templates/doc/tables/summary.ftl 2006-10-24 10:50:28 UTC (rev 10643)
+++ branches/Branch_3_2/HibernateExt/tools/src/templates/doc/tables/summary.ftl 2006-10-24 11:31:35 UTC (rev 10644)
@@ -1,90 +1,87 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<HTML>
+ <HEAD>
+ <TITLE>Hibernate Mappings - Table Summary</TITLE>
+ <LINK REL="stylesheet" TYPE="text/css" HREF="${docFileManager.getRef(docFile, docFileManager.getCssStylesDocFile())}" TITLE="Style"/>
+ </HEAD>
+ <BODY>
-<HEAD>
+ <H1>Hibernate Mapping Documentation</H1>
-<TITLE>Hibernate Mappings - Table Summary</TITLE>
+ <#if graphsGenerated>
+ <p>
+ <img src="tablegraph.png" usemap="#tablegraph"/>
+ <map name="tablegraph">
+ ${tablegrapharea}
+ </map>
+ </p>
+ </#if>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="${docFileManager.getRef(docFile, docFileManager.getCssStylesDocFile())}" TITLE="Style">
+ <H2>List of Tables by Schema</H2>
-</HEAD>
-
-<BODY>
-
-<H1>Hibernate Mapping Documentation</H1>
-
-<#if graphsGenerated>
-<p>
- <img src="tablegraph.png" usemap="#tablegraph"/>
- <map name="tablegraph">
- ${tablegrapharea}
- </map>
-</p>
-</#if>
-
-<H2>List of Tables by Schema</H2>
-
-<#foreach schema in dochelper.tablesBySchema.keySet()>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0">
- <THEAD>
- <TR>
- <TH COLSPAN="2" CLASS="MainTableHeading">
- ${schema}
- </TH>
- </TR>
- </THEAD>
- <TBODY>
-<#foreach table in dochelper.getTables(schema)>
- <TR>
- <TD>
- <A HREF='${docFileManager.getRef(docFile, docFileManager.getTableDocFile(table))}' TARGET="generalFrame">
- <B>${table.name}</B>
- </A>
- </TD>
- <TD>
- <TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0">
- <THEAD>
+ <#foreach schema in dochelper.tablesBySchema.keySet()>
+ <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0">
+ <THEAD>
+ <TR>
+ <TH COLSPAN="2" CLASS="MainTableHeading">
+ ${schema}
+ </TH>
+ </TR>
+ </THEAD>
+ <TBODY>
+ <#foreach table in dochelper.getTables(schema)>
<TR>
- <TH WIDTH="50%">
- Name
- </TH>
- <TH WIDTH="30%">
- SQL Type
- </TH>
- <TH WIDTH="15%">
- Nullable
- </TH>
- <TH WIDTH="15%">
- Unique
- </TH>
- </TR>
- </THEAD>
- <TBODY>
-<#foreach column in table.columnIterator>
- <TR>
<TD>
- <A HREF='${docFileManager.getRef(docFile, docFileManager.getTableDocFile(table))}#column_detail_${column.name}' TARGET="generalFrame">
- ${column.name}
+ <A HREF='${docFileManager.getRef(docFile, docFileManager.getTableDocFile(table))}' TARGET="generalFrame">
+ <B>${table.name}</B>
</A>
</TD>
<TD>
- ${dochelper.getSQLTypeName(column)}
+ <TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0">
+ <THEAD>
+ <TR>
+ <TH WIDTH="50%">
+ Name
+ </TH>
+ <TH WIDTH="30%">
+ SQL Type
+ </TH>
+ <TH WIDTH="15%">
+ Nullable
+ </TH>
+ <TH WIDTH="15%">
+ Unique
+ </TH>
+ </TR>
+ </THEAD>
+ <TBODY>
+ <#foreach column in table.columnIterator>
+ <TR>
+ <TD>
+ <A HREF='${docFileManager.getRef(docFile, docFileManager.getTableDocFile(table))}#column_detail_${column.name}' TARGET="generalFrame">
+ ${column.name}
+ </A>
+ </TD>
+ <TD>
+ ${dochelper.getSQLTypeName(column)}
+ </TD>
+ <TD ALIGN="CENTER">
+ ${column.nullable?string}
+ </TD>
+ <TD ALIGN="CENTER">
+ ${column.unique?string}
+ </TD>
+ </TR>
+ </#foreach>
+ </TBODY>
+ </TABLE>
</TD>
- <TD ALIGN="CENTER">
- ${column.nullable?string}
- </TD>
- <TD ALIGN="CENTER">
- ${column.unique?string}
- </TD>
</TR>
-</#foreach>
- </TBODY>
- </TABLE>
- </TD>
- </TR>
-</#foreach>
- </TBODY>
-</TABLE>
-</#foreach>
-</BODY>
\ No newline at end of file
+ </#foreach>
+ </TBODY>
+ </TABLE>
+ </#foreach>
+
+ </BODY>
+</HTML>
Modified: branches/Branch_3_2/HibernateExt/tools/src/templates/doc/tables/table-list.ftl
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/templates/doc/tables/table-list.ftl 2006-10-24 10:50:28 UTC (rev 10643)
+++ branches/Branch_3_2/HibernateExt/tools/src/templates/doc/tables/table-list.ftl 2006-10-24 11:31:35 UTC (rev 10644)
@@ -1,31 +1,26 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<HTML>
+ <HEAD>
+ <TITLE>Hibernate Mappings - Table List</TITLE>
+ <LINK REL ="stylesheet" TYPE="text/css" HREF="${docFileManager.getRef(docFile, docFileManager.getCssStylesDocFile())}" TITLE="Style"/>
+ </HEAD>
+ <BODY>
-<HEAD>
+ <TABLE BORDER="0" WIDTH="100%" SUMMARY="">
+ <TR>
+ <TD NOWRAP>
+ <FONT CLASS="ListTitleFont">
+ ${title}
+ </FONT>
+ <BR>
+ <#foreach table in tableList>
+ <A HREF='${docFileManager.getRef(docFile, docFileManager.getTableDocFile(table))}' TARGET="generalFrame">${table.name}</A>
+ <BR>
+ </#foreach>
+ </TD>
+ </TR>
+ </TABLE>
-<TITLE>Hibernate Mappings - Table List</TITLE>
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="${docFileManager.getRef(docFile, docFileManager.getCssStylesDocFile())}" TITLE="Style">
-
-</HEAD>
-
-<BODY>
-
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
- <TR>
- <TD NOWRAP>
- <FONT CLASS="ListTitleFont">
- ${title}
- </FONT>
- <BR>
-<#foreach table in tableList>
- <A HREF='${docFileManager.getRef(docFile, docFileManager.getTableDocFile(table))}' TARGET="generalFrame">${table.name}</A>
- <BR>
-</#foreach> </TD>
- </TR>
-</TABLE>
-
-</BODY>
-
-</HTML>
\ No newline at end of file
+ </BODY>
+</HTML>
Modified: branches/Branch_3_2/HibernateExt/tools/src/templates/doc/tables/table.ftl
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/templates/doc/tables/table.ftl 2006-10-24 10:50:28 UTC (rev 10643)
+++ branches/Branch_3_2/HibernateExt/tools/src/templates/doc/tables/table.ftl 2006-10-24 11:31:35 UTC (rev 10644)
@@ -1,285 +1,306 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<HTML>
+ <HEAD>
+ <TITLE>Hibernate Mappings - Table Info</TITLE>
+ <LINK REL="stylesheet" TYPE="text/css" HREF="${docFileManager.getRef(docFile, docFileManager.getCssStylesDocFile())}" TITLE="Style"/>
+ </HEAD>
+ <BODY>
-<HEAD>
+ <H3>Table: ${table.name}</H3>
+ <H4>Schema: ${dochelper.getQualifiedSchemaName(table)}</H4>
-<TITLE>Hibernate Mappings - Table Info</TITLE>
+ <p>${table.comment?if_exists}</p>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="${docFileManager.getRef(docFile, docFileManager.getCssStylesDocFile())}" TITLE="Style">
+ <A NAME="column_summary"></A>
+ <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0">
+ <THEAD>
+ <TR>
+ <TH COLSPAN="9" CLASS="MainTableHeading">
+ Column Summary
+ </TH>
+ </TR>
+ <TR>
+ <TH WIDTH="14%">
+ Name
+ </TH>
+ <TH WIDTH="14%">
+ SqlType
+ </TH>
+ <TH WIDTH="14%">
+ Length
+ </TH>
+ <TH WIDTH="14%">
+ Precision
+ </TH>
+ <TH WIDTH="14%">
+ Scale
+ </TH>
+ <TH WIDTH="14%">
+ Nullable
+ </TH>
+ <TH WIDTH="14%">
+ Unique
+ </TH>
+ </TR>
+ </THEAD>
+ <TBODY>
+ <#foreach column in table.columnIterator>
+ <TR>
+ <TD>
+ <A HREF='#column_detail_${column.name}'>
+ ${column.name}
+ </A>
+ </TD>
+ <TD>
+ ${dochelper.getSQLTypeName(column)}
+ </TD>
+ <TD ALIGN="RIGHT">
+ ${column.length}
+ </TD>
+ <TD ALIGN="RIGHT">
+ ${column.precision}
+ </TD>
+ <TD ALIGN="RIGHT">
+ ${column.scale}
+ </TD>
+ <TD ALIGN="CENTER">
+ ${column.nullable?string}
+ </TD>
+ <TD ALIGN="CENTER">
+ ${column.unique?string}
+ </TD>
+ </TR>
+ </#foreach>
+ </TBODY>
+ </TABLE>
-</HEAD>
+ <P>
+ <#-- SHOW THE PRIMARY KEY -->
+ <A NAME="primary_key"></A>
+ <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0">
+ <THEAD>
+ <TR>
+ <TH COLSPAN="2" CLASS="MainTableHeading">
+ Primary Key
+ </TH>
+ </TR>
+ </THEAD>
+ <TBODY>
+ <#if table.hasPrimaryKey()>
+ <TR>
+ <TD WIDTH="50%">
+ <#if table.primaryKey.name?has_content>
+ ${table.primaryKey.name}
+ <#else>
+ Name not specified
+ </#if>
+ </TD>
+ <TD WIDTH="50%">
+ <#list table.primaryKey.columnIterator() as column>
+ <A HREF='#column_detail_${column.name}'>
+ ${column.name}
+ <BR>
+ </A>
+ </#list>
+ </TD>
+ </TR>
+ <#else>
+ <TR>
+ <TD>
+ No Primary Key
+ </TD>
+ </TR>
+ </#if>
+ </TBODY>
+ </TABLE>
+ </P>
-<BODY>
+ <#-- SHOW THE FOREIGN KEYS -->
+ <#if table.foreignKeyIterator.hasNext()>
+ <P>
+ <A NAME="foreign_keys"></A>
+ <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0">
+ <THEAD>
+ <TR>
+ <TH COLSPAN="3" CLASS="MainTableHeading">
+ Foreign Keys
+ </TH>
+ </TR>
+ <TR>
+ <TH WIDTH="33%">
+ Name
+ </TH>
+ <TH WIDTH="33%">
+ Referenced Table
+ </TH>
+ <TH WIDTH="33%">
+ Columns
+ </TH>
+ </TR>
+ </THEAD>
+ <TBODY>
+ <#foreach foreignKey in table.foreignKeyIterator>
+ <TR>
+ <TD>
+ ${foreignKey.name?default("Name not specified")}
+ </TD>
+ <TD>
+ <A HREF='${docFileManager.getRef(docFile, docFileManager.getTableDocFile(foreignKey.referencedTable))}' TARGET="generalFrame">
+ ${foreignKey.referencedTable.name}
+ </A>
+ </TD>
+ <TD>
+ <#foreach column in foreignKey.getColumnIterator()>
+ <A HREF='#column_detail_${column.name}'>
+ ${column.name}
+ <BR>
+ </A>
+ </#foreach>
+ </TD>
+ </TR>
+ </#foreach>
+ </TBODY>
+ </TABLE>
+ </P>
+ </#if>
+
+ <#-- SHOW THE UNIQUE KEYS -->
+ <#if table.uniqueKeyIterator.hasNext()>
+ <P>
+ <A NAME="unique_keys"></A>
+ <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0">
+ <THEAD>
+ <TR>
+ <TH COLSPAN="2" CLASS="MainTableHeading">
+ Unique Keys
+ </TH>
+ </TR>
+ <TR>
+ <TH WIDTH="50%">
+ Name
+ </TH>
+ <TH WIDTH="50%">
+ Columns
+ </TH>
+ </TR>
+ </THEAD>
+ <TBODY>
+ <#foreach uniqueKey in table.getUniqueKeyIterator()>
+ <TR>
+ <TD>
+ ${uniqueKey.name?default("Name not specified")}
+ </TD>
+ <TD>
+ <#foreach column in uniqueKey.getColumnIterator()>
+ <A HREF='#column_detail_${column.name}'>
+ ${column.name}
+ <BR>
+ </A>
+ </#foreach>
+ </TD>
+ </TR>
+ </#foreach>
+ </TBODY>
+ </TABLE>
+ </P>
+ </#if>
+
+ <#-- SHOW THE TABLE INDEXES -->
+ <#if table.indexIterator.hasNext()>
+ <P>
+ <A NAME="indexes"></A>
+ <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0">
+ <THEAD>
+ <TR>
+ <TH COLSPAN="2" CLASS="MainTableHeading">
+ Indexes
+ </TH>
+ </TR>
+ <TR>
+ <TH WIDTH="50%">
+ Name
+ </TH>
+ <TH WIDTH="50%">
+ Columns
+ </TH>
+ </TR>
+ </THEAD>
+ <TBODY>
+ <#foreach index in table.indexIterator>
+ <TR>
+ <TD>
+ ${index.name?default("Name not specificed")}
+ </TD>
+ <TD>
+ <#foreach column in index.columnIterator>
+ <A HREF='#column_detail_${column.name}'>
+ ${column.name}
+ <BR>
+ </A>
+ </#foreach>
+ </TD>
+ </TR>
+ </#foreach>
+ </TBODY>
+ </TABLE>
+ </P>
+ </#if>
+
+ <#if table.columnIterator.hasNext()>
+ <P>
+ <A NAME="column_detail"></A>
+ <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0">
+ <THEAD>
+ <TR>
+ <TH CLASS="MainTableHeading">
+ Column Detail
+ </TH>
+ </TR>
+ </THEAD>
+ </TABLE>
-<H3>Table: ${table.name}</H3>
-<H4>Schema: ${dochelper.getQualifiedSchemaName(table)}</H4>
+ <#foreach column in table.columnIterator>
+ <A NAME='column_detail_${column.name}'></A>
+ <H3>${column.name}</H3>
+
+ <UL>
+ <LI>
+ <B>Type: </B>${dochelper.getSQLTypeName(column)}
+ </LI>
+ <LI>
+ <B>Length: </B>${column.length}
+ </LI>
+ <LI>
+ <B>Precision: </B>${column.precision}
+ </LI>
+ <LI>
+ <B>Scale: </B>${column.scale}
+ </LI>
+ <LI>
+ <B>Nullable: </B>${column.nullable?string}
+ </LI>
+ <LI>
+ <B>Unique: </B>${column.unique?string}
+ </LI>
+ <LI>
+ <B>Comment: </B>${column.comment?if_exists}
+ </LI>
+ </UL>
-<p>${table.comment?if_exists}</p>
+ <#--
+ <H4>Mappings:</H4>
-<A NAME="column_summary"></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0">
- <THEAD>
- <TR>
- <TH COLSPAN="9" CLASS="MainTableHeading">
- Column Summary
- </TH>
- </TR>
- <TR>
- <TH WIDTH="14%">
- Name
- </TH>
- <TH WIDTH="14%">
- SqlType
- </TH>
- <TH WIDTH="14%">
- Length
- </TH>
- <TH WIDTH="14%">
- Precision
- </TH>
- <TH WIDTH="14%">
- Scale
- </TH>
- <TH WIDTH="14%">
- Nullable
- </TH>
- <TH WIDTH="14%">
- Unique
- </TH>
- </TR>
- </THEAD>
- <TBODY>
-<#foreach column in table.columnIterator> <TR>
- <TD>
- <A HREF='#column_detail_${column.name}'>
- ${column.name}
- </A>
- </TD>
- <TD>
- ${dochelper.getSQLTypeName(column)}
- </TD>
- <TD ALIGN="RIGHT">
- ${column.length}
- </TD>
- <TD ALIGN="RIGHT">
- ${column.precision}
- </TD>
- <TD ALIGN="RIGHT">
- ${column.scale}
- </TD>
- <TD ALIGN="CENTER">
- ${column.nullable?string}
- </TD>
- <TD ALIGN="CENTER">
- ${column.unique?string}
- </TD>
- </TR>
-</#foreach>
- </TBODY>
-</TABLE>
+ #foreach($property in $dochelper.getProperties($table, $column))
+ $property.persistentClass.className - $property.name
+ #end
+ -->
-<P>
+ <HR/>
+ </#foreach>
+
+ </P>
+ </#if>
-<#-- SHOW THE PRIMARY KEY
--->
-<A NAME="primary_key"></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0">
- <THEAD>
- <TR>
- <TH COLSPAN="2" CLASS="MainTableHeading">
- Primary Key
- </TH>
- </TR>
- </THEAD>
- <TBODY>
-<#if table.hasPrimaryKey()>
- <TR>
- <TD WIDTH="50%">
-<#if table.primaryKey.name?has_content>
- ${table.primaryKey.name}
-<#else>
- Name not specified
-</#if> </TD>
- <TD WIDTH="50%">
-<#list table.primaryKey.columnIterator() as column>
- <A HREF='#column_detail_${column.name}'>
- ${column.name}<BR>
- </A>
-</#list>
- </TD>
- </TR>
-<#else> <TR>
- <TD>
- No Primary Key
- </TD>
- </TR>
-</#if> </TBODY>
-</TABLE>
-
-<#-- SHOW THE FOREIGN KEYS -->
-<#if table.foreignKeyIterator.hasNext()><P>
-
-<A NAME="foreign_keys"></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0">
- <THEAD>
- <TR>
- <TH COLSPAN="3" CLASS="MainTableHeading">
- Foreign Keys
- </TH>
- </TR>
- <TR>
- <TH WIDTH="33%">
- Name
- </TH>
- <TH WIDTH="33%">
- Referenced Table
- </TH>
- <TH WIDTH="33%">
- Columns
- </TH>
- </TR>
- </THEAD>
- <TBODY>
-<#foreach foreignKey in table.foreignKeyIterator>
- <TR>
- <TD>
- ${foreignKey.name?default("Name not specified")}
- </TD>
- <TD>
- <A HREF='${docFileManager.getRef(docFile, docFileManager.getTableDocFile(foreignKey.referencedTable))}' TARGET="generalFrame">
- ${foreignKey.referencedTable.name}
- </A>
- </TD>
- <TD>
-<#foreach column in foreignKey.getColumnIterator()>
- <A HREF='#column_detail_${column.name}'>
- ${column.name}<BR>
- </A>
-</#foreach>
- </TD>
- </TR>
-</#foreach> </TBODY>
-</TABLE>
-</#if>
-<#-- SHOW THE UNIQUE KEYS
--->
-<#if table.uniqueKeyIterator.hasNext()>
-<P>
-
-<A NAME="unique_keys"></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0">
- <THEAD>
- <TR>
- <TH COLSPAN="2" CLASS="MainTableHeading">
- Unique Keys
- </TH>
- </TR>
- <TR>
- <TH WIDTH="50%">
- Name
- </TH>
- <TH WIDTH="50%">
- Columns
- </TH>
- </TR>
- </THEAD>
- <TBODY>
-<#foreach uniqueKey in table.getUniqueKeyIterator()>
- <TR>
- <TD>
- ${uniqueKey.name?default("Name not specified")}
- </TD>
- <TD>
-<#foreach column in uniqueKey.getColumnIterator()>
- <A HREF='#column_detail_${column.name}'>
- ${column.name}<BR>
- </A>
-</#foreach>
- </TD>
- </TR>
-</#foreach>
- </TBODY>
-</TABLE>
-</#if>
-<#-- SHOW THE TABLE INDEXES-->
-<#if table.indexIterator.hasNext()><P>
-
-<A NAME="indexes"></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0">
- <THEAD>
- <TR>
- <TH COLSPAN="2" CLASS="MainTableHeading">
- Indexes
- </TH>
- </TR>
- <TR>
- <TH WIDTH="50%">
- Name
- </TH>
- <TH WIDTH="50%">
- Columns
- </TH>
- </TR>
- </THEAD>
- <TBODY>
-<#foreach index in table.indexIterator>
- <TR>
- <TD>
- ${index.name?default("Name not specificed")}
- </TD>
- <TD>
-<#foreach column in index.columnIterator>
- <A HREF='#column_detail_${column.name}'>
- ${column.name}<BR>
- </A>
-</#foreach>
- </TD>
- </TR>
-</#foreach> </TBODY>
-</TABLE>
-</#if>
-<#if table.columnIterator.hasNext()>
-<P>
-
-<A NAME="column_detail"></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0">
- <THEAD>
- <TR>
- <TH CLASS="MainTableHeading">
- Column Detail
- </TH>
- </TR>
- </THEAD>
-</TABLE>
-
-<#foreach column in table.columnIterator>
-<A NAME='column_detail_${column.name}'></A>
-<H3>${column.name}</H3>
-
-<UL>
- <LI><B>Type: </B>${dochelper.getSQLTypeName(column)}</LI>
- <LI><B>Length: </B>${column.length}</LI>
- <LI><B>Precision: </B>${column.precision}</LI>
- <LI><B>Scale: </B>${column.scale}</LI>
- <LI><B>Nullable: </B>${column.nullable?string}</LI>
- <LI><B>Unique: </B>${column.unique?string}</LI>
- <LI><B>Comment: </B>${column.comment?if_exists}</LI>
-</UL>
-
-<P>
-
-<#--
-<H4>Mappings:</H4>
-
-#foreach($property in $dochelper.getProperties($table, $column))
-$property.persistentClass.className - $property.name
-#end
--->
-
-<HR>
-</#foreach>
-</#if>
-</BODY>
-
-</HTML>
\ No newline at end of file
+ </BODY>
+</HTML>
18 years, 1 month
- 1
- 0
Hibernate SVN: r10643 - branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/doc
by hibernate-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2006-10-24 06:50:28 -0400 (Tue, 24 Oct 2006)
New Revision: 10643
Modified:
branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/doc/DocHelper.java
Log:
HBX-787 Entity lists are not alphabetically sorted
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 2006-10-24 10:49:35 UTC (rev 10642)
+++ branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/doc/DocHelper.java 2006-10-24 10:50:28 UTC (rev 10643)
@@ -2,6 +2,7 @@
import java.util.ArrayList;
import java.util.Collections;
+import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
@@ -34,7 +35,17 @@
*/
public final class DocHelper {
- /**
+ /** used to sort pojoclass according to their declaration name */
+ static final Comparator POJOCLASS_COMPARATOR = new Comparator() {
+ public int compare(Object o1, Object o2) {
+ POJOClass that = (POJOClass) o1;
+ POJOClass what = (POJOClass) o2;
+
+ return that.getDeclarationName().compareTo(what.getDeclarationName());
+ }
+ };
+
+ /**
* Name to use if the schema is not specified.
*/
public static final String DEFAULT_NO_SCHEMA_NAME = "default";
@@ -305,12 +316,15 @@
}
/**
- * return List of POJOClass corresponding to packageName passed
+ * return a sorted List of POJOClass corresponding to packageName passed
* @param packageName packageName other than DEFAULT_NO_PACKAGE
- * @return List of POJOClass
+ * @return a sorted List of POJOClass
*/
public List getClasses(String packageName){
- return (List)classesByPackage.get(packageName);
+ List classes = (List)classesByPackage.get(packageName);
+ List orderedClasses = new ArrayList(classes);
+ Collections.sort(orderedClasses, POJOCLASS_COMPARATOR);
+ return orderedClasses;
}
/**
@@ -324,11 +338,13 @@
}
/**
- * Return List of all POJOClass
+ * Return a sorted List of all POJOClass
* @return
*/
public List getClasses(){
- return classes;
+ List orderedClasses = new ArrayList(classes);
+ Collections.sort(orderedClasses, POJOCLASS_COMPARATOR);
+ return orderedClasses;
}
/**
18 years, 1 month
- 1
- 0
Hibernate SVN: r10642 - branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng
by hibernate-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2006-10-24 06:49:35 -0400 (Tue, 24 Oct 2006)
New Revision: 10642
Modified:
branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/OverrideBinder.java
Log:
imports
Modified: branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/OverrideBinder.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/OverrideBinder.java 2006-10-24 10:36:19 UTC (rev 10641)
+++ branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/OverrideBinder.java 2006-10-24 10:49:35 UTC (rev 10642)
@@ -1,7 +1,6 @@
package org.hibernate.cfg.reveng;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Properties;
@@ -14,7 +13,6 @@
import org.hibernate.mapping.Column;
import org.hibernate.mapping.ForeignKey;
import org.hibernate.mapping.Table;
-import org.hibernate.tool.hbm2x.MetaAttributeHelper;
import org.hibernate.util.StringHelper;
18 years, 1 month
- 1
- 0
Hibernate SVN: r10641 - branches/Branch_3_2/HibernateExt/tools/src/templates/doc/entities
by hibernate-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2006-10-24 06:36:19 -0400 (Tue, 24 Oct 2006)
New Revision: 10641
Modified:
branches/Branch_3_2/HibernateExt/tools/src/templates/doc/entities/entity.ftl
Log:
HBX-788 Not well-formed HTML produced for formula properties
Modified: branches/Branch_3_2/HibernateExt/tools/src/templates/doc/entities/entity.ftl
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/templates/doc/entities/entity.ftl 2006-10-24 10:33:00 UTC (rev 10640)
+++ branches/Branch_3_2/HibernateExt/tools/src/templates/doc/entities/entity.ftl 2006-10-24 10:36:19 UTC (rev 10641)
@@ -76,8 +76,8 @@
<A HREF='#property_summary'>
${column.getName()}
</A>
+ </TD>
</#if>
- </TD>
<#else>
<TD WIDTH="14%" >
@@ -188,8 +188,8 @@
<A HREF='#property_summary'>
${column.getName()}
</A>
- </#if> </TD>
-
+ </TD>
+ </#if>
<#else> <TD WIDTH="14%" >
</TD>
18 years, 1 month
- 1
- 0