Hibernate

Update of /cvsroot/hibernate/HibernateExt/org.hibernate.eclipse.help
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8118

Modified Files:
	doc.zip toctoolsreference.xml 
Log Message:
update online help to latest version of tools doc

Index: doc.zip
===================================================================
RCS file: /cvsroot/hibernate/HibernateExt/org.hibernate.eclipse.help/doc.zip,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
Binary files /tmp/cvsGP7TbJ and /tmp/cvspVxVsu differ

Index: toctoolsreference.xml
===================================================================
RCS file: /cvsroot/hibernate/HibernateExt/org.hibernate.eclipse.help/toctoolsreference.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- toctoolsreference.xml	23 Dec 2005 20:10:37 -0000	1.3
+++ toctoolsreference.xml	29 Dec 2005 22:05:41 -0000	1.4
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <toc label="Hibernate Tools Reference">
-      <topic label="Eclipse plugins" href="html/tools/eclipse/index.html"/>
-      <topic label="Ant tools" href="html/tools/ant/en/html_single/index.html"/>      
+      <topic label="Ant and Eclipse Tools" href="html/tools/ant/en/html_single/index.html"/>      
       <topic label="New &amp; Noteworthy" href="html/tools/eclipse/newandnoteworthy/hibernate-eclipse-news-3.1.0.beta3.html"/>
 </toc>

Update of /cvsroot/hibernate/HibernateExt/org.hibernate.eclipse/lib/tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7887/lib/tools

Modified Files:
	hibernate-tools.jar 
Log Message:
update lib

Index: hibernate-tools.jar
===================================================================
RCS file: /cvsroot/hibernate/HibernateExt/org.hibernate.eclipse/lib/tools/hibernate-tools.jar,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
Binary files /tmp/cvsQTQ57J and /tmp/cvs3xJ2pT differ

Update of /cvsroot/hibernate/HibernateExt/tools/doc/reference/en/modules
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3496/doc/reference/en/modules

Modified Files:
	setup.xml ant.xml plugins.xml 
Added Files:
	codegenarchitecture.xml plugins.html 
Log Message:
updated docs

--- NEW FILE: codegenarchitecture.xml ---
<?xml version="1.0" encoding="ISO-8859-1"?>
<chapter id="codegenarchitecture">
  <title>Code generation architecture</title>

  <para>The code generation mechanism in the Hibernate Tools consists of a few
  core concepts. This section explains their overall structure which are the
  same for the Ant and Eclipse tools.</para>

  <section>
    <title>Hibernate Meta Model</title>

    <para>The meta model is the model used by Hibernate core to perform its
    object relational mapping. The model includes information about tables,
    columns, classes, properties, components, values, collections etc. The API
    is in <literal>org.hibernate.mapping</literal> and its main entry point is
    the <literal>Configuration</literal> class, the same class that is used to
    build a session factory.</para>

    <para>The model represented by the <literal>Configuration</literal> class
    can be build in many ways. The best known is by using hbm.xml files to
    describe the meta model, other methods are using annotations in java
    source code and a third is reading JDBC metadata and build a
    configuration. The last method is provided via the reverse engineering
    part of the hibernate tools.</para>

    <para></para>

    <para>The code generation is done based on this model no matter which
    method have been used to create the meta model, and thus the code
    generation is independent on the source of the meta model and represented
    via Exporters.</para>
  </section>

  <section>
    <title>Exporters</title>

    <para>Code generation is done in so called Exporters. An
    <literal>Exporter</literal> is handed a Hibernate Meta Model represented
    as a <literal>Configuration</literal> instance and it is then the job of
    the exporter to generate a set of code artifacts.</para>

    <para>The tools provides a default set of Exporter's which can be used in
    both Ant and the Eclipse UI. Documentation for these Exporters is in the
    Ant and Eclipse sections.</para>

    <para>Users can provide their own customer Exporter's, either by custom
    classes implementing the Exporter interface or simply be providing custom
    velocity templates. This is documented at <xref
    linkend="hbmtemplate" /></para>
  </section>
</chapter>
--- NEW FILE: plugins.html ---

<section>
<title>Hibernate Tools</title>
<para>Reverse engineering and code generation with Eclipse plugins and a hbm.xml editor</para>

  <section>
    <title>Introduction</title>

<para>We have made significant improvements to the Hibernate toolset for Hibernate3. This is however work in progress and we'll continue to implement new ideas and features as the third generation of the Hibernate3 object persistence stack evolves.
</para>

<para>The first set of tools we offer are plugins for the Eclipse IDE. The following features are available:</para>

<para>Mapping Editor: An editor for Hibernate XML mapping files, supporting auto-completion and syntax highlighting. It also supports semantic auto-completion for class names and property/field names, making it much more versatile than a normal XML editor.</para>

<para>Console: The console is a new view in Eclipse. In addition to a tree overview of your console configurations, you also get an interactive view of your persistent classes and their relationships. The console allows you to execute HQL queries against your database and browse the result directly in Eclipse.</para>

<para>Development Wizards: Several wizards are provided with the Hibernate Eclipse tools; you can use a wizard to quickly generate Hibernate configuration (cfg.xml) files, or you may even completely reverse engineer an existing database schema into POJO source files and Hibernate mapping files. The reverse engineering wizard supports customizable templates.</para>

</section>
<section>
<title>2. Requirements</title>

<para>
  <ol>
    <li>Install Eclipse 3.1 (<a href="http://www.eclipse.org/">http://www.eclipse.org</a>)</li>
  </ol>
</para>

<para>After you have downloaded the Hibernate Tools for Eclipse, unpack and copy the plugins to your Eclipse plugins directory. 
Sometimes Eclipse does not automatically detect new plugins and thus the tools will not be activated. To ensure eclipse sees
these changes run eclipse with the -clean option. E.g. <code>eclipse -clean</code>
</para>

<para>You will also need JDBC drivers for your database available to use the reverse engineering and querying support.</para>

<para>
  Please note that these tools do not try to hide any functionality of Hibernate. The tools make working with
  Hibernate easier, but you are still encouraged/required to read the documentation for Hibernate to fully
  utilize Hibernate.
</para>
</section>

<section>
<title>3. Creating a Hibernate configuration file</title>

  <para>
    To be able to reverse engineer, prototype queries, and of course to
    simply use Hibernate a hibernate.properties or hibernate.cfg.xml
    file is needed. The Hibernate Tools provide a wizard for generating
    the hibernate.cfg.xml file.
  </para>

  <para>
    Start the wizard by clicking "New Wizard" (Ctrl+N), select the Hibernate/Hibernate Configuration file (cfg.xml)
    wizard and press "Next". After selecting the location for the hibernate.cfg.xml file, you will see the following page: 
  </para>
  <img src="hibernatecfgwizard.jpg" border="1"/>
  Creating hibernate.cfg.xml

    <para>
      Enter your configuration information in this dialog. Details about the configuration options can be found
      in Hibernate reference documentation. Press "Finish" to create the configuration file, it will be
      automatically opened in an editor.
    </para>

    <para>
      Tip: The contents in the combo boxes for the JDBC driver class and JDBC URL change automatically, depending
      on the Dialect and actual driver you have chosen.
    </para>
  
  </section>
    <section>
<title>4. XML Mapping Editor</title>

<para>The XML mapping editor provides basic XML editing functionality as well as package, class, and field
completion for relevant XML attributes. The auto-completion detects it's context and limits the completion for e.g.
&lt;property&gt; and only shows the properties/fields available in the
  enclosing &lt;class&gt;, &lt;subclass&gt; etc.</para>

  <img src="hbmxmlcompletion.jpg" border="1"/>
  Context dependent code completion in the XML mapping editor

</section>
    
<section>
<title>5. Hibernate Console perspective</title>

<para>The Hibernate Console perspective combines a set of views which allow
  you to see the structure of your mapped entities/classes, edit HQL queries, execute
  the queries, and see the results. To use this perspective you need to create a console configuration.
</para>

<title>5.1 Creating a console configuration</title>

  <para>
    You create a console configuration by running the Console Configuration wizard, shown in the following screenshot:
  </para>
    
  <img src="consolecfgwizard.jpg" border="1"/>
  <br><b>Creating a Hibernate Console configuration</b></br><br>

    <para>
      The following table describes the available settings. The wizard can automatically detect default values.
    </para>

      <table width="100%" border="1">
        <th>Parameter</th><th>Description</th><th>Autodetect</th>
          <tr>
            <td>Name</td><td>The unique name of the configuration</td><td>Name of the Java project</td>
            </tr>
            <tr>
            <td>Property file</td><td>Path to a hibernate.properties file/td><td>First hibernate.properties file found in the project</td>
            </tr>
            <tr>
            <td nowrap="true">Configuration file</td><td>Path to a hibernate.cfg.xml</td><td>First hibernate.cfg.xml found in the project</td>
            </tr>
            <tr>
            <td>Mapping files</td><td>List of additional mapping files that should be loaded. Note: A hibernate.cfg.xml can also contain mappings, avoid duplication.</td><td>All hbm.xml files found in the project</td>
            </tr>
            <tr>
            <td>Classpath</td><td>The classpath for loading POJO and JDBC drivers. Don't add Hibernate core libraries or
dependencies, they are already included.</td><td>The default build output directory and any JARs with a class implementing java.sql.Driver</td>
          </tr>
      </table>
    </para>

    <para>
      Clicking "Finish" creates the configuration and shows it in the Console overview.
    </para>

<title>5.2 Viewing the entity structure</title>

<para>
  To view your new configuration and entity/class structure, right click the
configuration in the list and select "Create SessionFactory". This will create a
standard Hibernate <tt>SessionFactory</tt> using your settings.</para>

<para>Clicking on the small <tt>+</tt> symbol allows you to browse the class/entity structure
and see the relationships.</para>

<para>Errors during creation of the <tt>SessionFactory</tt> (e.g. if your configuration is incorrect) will
be shown in a message dialog, you may get more information about the error in the Error Log view on the
right pane.
</para>

  <img src="queryconsole.jpg" border="1"/>
  <br><b>Hibernate Console perspective showing entity structure, query editor and result</b></br><br>

<title>5.3 Prototyping Queries</title>

<para>Queries can be executed in two ways: by double clicking on entity
  names in the tree or by entering HQL in the HQL editor and pressing
    the green execute button.</para>

    <para>Results of a query will be shown in the Query result view and
    details of possible errors (syntax errors, database errors, etc.) can
    be seen in the Error Log view.</para>

<para>Tip: HQL queries are executed using <tt>list()</tt> and
without any limit of the size of the output. Be careful if you
execute a query on a large result set. You might run out of memory. This
will be improved in a future version.</para>

  <section>
<title>5.4 Properties view</title>

<para>The properties view shows the structure of any selected persistent object in the results view. Editing is not yet supported.</para>

<para>The properties view is still very experimental, thus if you experience issues while having it visible then close it to be able
to work with the remaining functionallity</para>
</section>

<section>
<title>6. Reverse engineering and code generation</title>

<para>A very simple "click-and-generate" reverse engineering and code generation facility is
also available. The reverse engineering internally creates a Hibernate meta model. On this meta-model
a set of (velocity) templates are applied, generating a set of artifacts. Currently supported are
POJO Java source file, Hibernate *.hbm.xml, and hibernate.cfg.xml generation. To start this process,
choose the "Hibernate Artifact Generation Wizard".</para>

  <img src="codegenwizard.jpg" border="1"/>
  Artifact Generation Wizard

    <para>
      First select which Console configuration should be used and the target directory for
code and mapping file generation. Note: Generation will generate files, and overwrite
      possibly existing files in this location. 
    </para>

   <para>Now choose from the following list of options:</para>

      <section>
      <title>6.1 Reverse engineering</title>

        <para>
          Reverse engineering will connect to your database and read the JDBC metadata of your
	database schema.  The basic rules for the conversion is that each table/view
          found is mapped to a POJO class, and each column is mapped to a
          property. The package name controls the "root" package of the
          generated classes.
        </para>

        <para>
          For each found foreign key, a &lt;many-to-one&gt; and a corresponding
          &lt;one-to-many&gt; mapping, using a <tt>Set</tt>, will be created. 
        </para>
        
        <para>
          The flag "Generate 'raw' composite ids" turns on special handling of
	composite primary keys. A &lt;composite-id&gt; mapping will always be
	created, and if there are matching
          foreign-keys, a &lt;key-many-to-one&gt; will be created as well.
          If you choose to active the 'raw' composite ids, then
          each composite key column is considered a 'raw' scalar
          (string, long, etc.) instead of a reference to an
          entity. Note: a &lt;many-to-one&gt; property is still
          created, but is simply marked as non-updatable and
          non-insertable.
        </para>
      </section>

      <section>
      <title>6.2 POJO code generation</title>
        
        <para>
          The code generation will generate all the persistent classes
          and components found in the given Hibernate configuration.</para>
	  You can
          use the code generation on your own handwritten or reverse-engineered
	mapping files.
        </para>

          <para>
            This "EJB3/JSR-220 annotations" option will activate usage of the
            EJB3 sections in the javaclass.vm template. This is considered
	experimental and currently incomplete. Updates to the template are
expected, you can even write (and hopefully
            contribute) more powerful templates.
          </para>

        <para>
          The Java code generation is based on a a complete
          rewrite of the hbm2java found in the Hibernate 2.x toolset.  This
          means that feature-wise they should be equal, but
          there might be some exotic &lt;meta&gt; features
          not fully implemented so far. Please report any bugs or missing
	code generation features via our issue tracking system.
        </para>
        
        <para>
          Consult the Hibernate documentation for the various code generation
	tags you can use in your mapping files.
        </para>
      </section>

      <section>
      <title>6.3 Hibernate Mapping file generation</title>   

        <para>
          This creates a hbm.xml for each class declared in the
          configuration (and their persistent subclasses). Each
          &lt;subclass&gt; or &lt;joined-subclass&gt; will be written 
          to a separate mapping file, an <tt>extends</tt> attribute is used.
        </para>

        <para>
          The mapping file generation feature currently supports only basic
	generation, completing the reverse engineering functionality. More
	features will be added in the future.
        </para>
      </section>
      <section>
        <title>6.4 Hibernate configuration file generation</title>

          <para>
            This option writes a hibernate.cfg.xml with all relevant
            properties and with a &lt;mapping&gt; reference
            for each persistent class          </para>
          </section>

          <section>
      <title>6.5 Custom templates</title>

        <para>
          All of the generated code is controlled via templates (except
          the hibernate.cfg.xml). The wizard searches
          for the templates in the classpath of the plugin, by default.
        </para>

        <para>
          You can customize templates by placing
          your own .vm files in a directory and naming the directory
	in the wizard dialog.
          You can override existing templates by using the same file names.
The built-in templates can be found in the hibernate-tools.jar in
          the org.hibernate.eclipse plugin directory.
        </para>

        <para>
         You may use a pre-defined set of variables and properties in templates,
	as shown in the following table.
          </para>

          <table border=1 width='100%'>
            <th>Name</th><th>Contents</th><th>Availability</th>
              <tr>
                <td>$cfg</td><td>The current Hibernate Configuration object. See Hibernate3 javadocs for available properties/methods.</td><td>Anywhere</td>
                </tr>
                <tr>
                <td>$c2h</td><td>A Cfg2HbmTool. Contains a set of helper methods related to cfg to hbm conversion. See sourcecode and existing templates for available properties/methods.</td><td>Anywhere</td>
                </tr>
                <tr>
                <td>$c2j</td><td>A Cfg2JavaTool. Contains a set of helper methods related to cfg to java conversion. See sourcecode and existing templates for available properties/methods.</td><td>Anywhere</td>
                </tr>
                <tr>
                <td>$clazz</td><td>A reference to the current PersistentClass or Component being processed.</td><td>In any class related template</td>
                </tr>
                <tr>
                <td>$property</td><td>A reference to the current Property being processed</td><td>In any property related template</td>
              </tr>
          </table>

          <para>
            Note that some of these properties are only available in
            a certain context (e.g. $property is not available at the
            Class level, but only fo rproperties).
            If you need to look up some information, you have full
            access to Hibernate's own meta-model, the <tt>Configuration</tt> via $cfg.
            This combined with the power of velocity templates should
            give you virtually unlimited flexibility and possibilities
            for code generation.
          </para>
	
	<para>
          Note that we expect significant changes to the structure and
	organization of the built-in templates in one of the next releases.
	</para>
  </section>

  <section>
	<title>7. Enable debug logging</title>
	
	<para>It is possible to configure the eclipse plugin to route all logging made
	by the plugins and hibernate code it self to the "Error log" view in Eclipse.</para>
	
	<para>
	This is done by editing the "hibernate-log4j.properties" in org.hibernate.eclipse/ directory/jar.
	This file includes a default configuration that only logs WARN and above to a set of custom
	appenders (PluginFileAppender and PluginLogAppender). You can change these settings to be as verbose
	or silent as you please - see hibernate documentation for interesting categories and log4j documentation
	for how to configure logging via a log4j property file.
	</para>
  </section>
  </section>
Index: setup.xml
===================================================================
RCS file: /cvsroot/hibernate/HibernateExt/tools/doc/reference/en/modules/setup.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- setup.xml	23 Dec 2005 14:01:15 -0000	1.2
+++ setup.xml	29 Dec 2005 21:35:48 -0000	1.3
@@ -2,11 +2,53 @@
 <chapter id="setup">
   <title>Download and install Hibernate Tools</title>
 
-  <section id="setup-requirements">
-    <title>Requirements</title>
+  <para>Hibernate tools can be used "standalone" via Ant 1.6.x or fully
+  integrated into a Eclipse 3.1.x based IDE, such as JBoss Eclipse IDE or a
+  default Eclipse 3.1.x installation. The following describes the install
+  steps in these environments.</para>
 
-    <para>Download the Hibernate Tools distribution from the Hibernate website
-    or use the Eclipse updatesite (see http://tools.hibernate.org for download
-    links) to install it directly into eclipse.</para>
+  <section>
+    <title>JBoss Eclipse IDE</title>
+
+    <para>JBoss Eclipse IDE 1.5.x includes Hibernate Tools and thus nothing is
+    required besides downloading and installing JBoss Eclipse IDE. If you need
+    to update to a newer version of the Hibernate Tools just follow the
+    instructions in the Eclipse IDE section.</para>
+  </section>
+
+  <section>
+    <title>Eclipse IDE</title>
+
+    <para>To install into any Eclipse 3.1.x based Eclipse IDE you can either
+    download the Hibernate Tools distribution from the Hibernate website or
+    use the Eclipse updatesite (see http://tools.hibernate.org for download
+    links).</para>
+
+    <para>If you download the Hibernate Tools distribution you need to place
+    the /plugins and /feature directory into your eclipse directory or eclipse
+    extensions directory. Sometimes Eclipse does not automatically detect new plugins and thus the tools will not be activated. To ensure eclipse sees
+    these changes run eclipse with the -clean option. E.g. <literal>eclipse -clean</literal>
+
+	Using the updatesite does not require any additional steps.</para>
+
+    <para></para>
+
+    <para>Tip: If you need more basic instructions on installing plugins and
+    general usage of eclipse then check out
+    https://eclipse-tutorial.dev.java.net/ and especially
+    https://eclipse-tutorial.dev.java.net/visual-tutorials/updatemanager.html
+    which covers using the update manager.</para>
+  </section>
+
+  <section>
+    <title>Ant</title>
+
+    <para>To use the tools via Ant you need the hibernate-tools.jar and
+    associated libraries. The libraries are included in the distribution from
+    the Hibernate website and the Eclipse updatesite. The libraries are
+    located in the eclipse plugins directory at
+    <literal>/plugins/org.hibernate.eclipse.x.x.x/lib/tools/. </literal>These
+    libraries are 100% independent from the eclipse platform. How to use these
+    via ant tasks are described in the Ant chapter.</para>
   </section>
 </chapter>
\ No newline at end of file

Index: ant.xml
===================================================================
RCS file: /cvsroot/hibernate/HibernateExt/tools/doc/reference/en/modules/ant.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ant.xml	23 Dec 2005 12:28:20 -0000	1.3
+++ ant.xml	29 Dec 2005 21:35:48 -0000	1.4
@@ -20,7 +20,8 @@
       <programlisting><![CDATA[ <taskdef 
      name="hibernatetool" 
      classname="org.hibernate.tool.ant.HibernateToolTask" 
-     classpath="[location of hibernate-tools.jar, velocity-1.4.jar, velocity-tools-generic-1.4.jar, jtidy-r8-21122004.jar, hibernate3.jar & jdbc drivers]"/> 
+     classpath="[location of hibernate-tools.jar, velocity-1.4.jar, velocity-tools-generic-1.1.jar, jtidy-r8-21122004.jar, 
+                 hibernate3.jar & jdbc drivers]"/> 
 ]]></programlisting></para>
 
       <para>This <literal>&lt;taskdef&gt;</literal> defines a Ant task called
@@ -213,9 +214,8 @@
       <para>Code exporters is the parts that does the actual job of converting
       the hibernate metamodel into various code artifacts. The following
       section describes the current supported set of exporters in the
-      Hibernate Tool distribution. It is also possible for userdefined</para>
-
-      <para>exporters, that is done through the
+      Hibernate Tool distribution. It is also possible for userdefined
+      exporters, that is done through the
       <literal>&lt;hbmtemplate&gt;</literal> exporter.</para>
 
       <section>
@@ -301,9 +301,8 @@
         <para></para>
       </section>
 
-      <section>
-        <title>Generic Hibernate metamodel exporter
-        (<literal>&lt;hbmtemplate&gt;</literal>)</title>
+      <section id="hbmtemplate">
+        <title>Generic Hibernate metamodel exporter (<literal>&lt;hbmtemplate&gt;</literal>)</title>
 
         <para>Generic exporter that can be controlled by a user provided
         template or class.</para>
@@ -347,7 +346,7 @@
       properties is specificed via <literal>&lt;property&gt;</literal> or
       <literal>&lt;propertyset&gt;</literal> and each exporter will have
       access to them directly in the templates and via
-      <literal>Exporter.setProperties()</literal>. </para>
+      <literal>Exporter.setProperties()</literal>.</para>
 
       <para></para>
 

Index: plugins.xml
===================================================================
RCS file: /cvsroot/hibernate/HibernateExt/tools/doc/reference/en/modules/plugins.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- plugins.xml	6 Nov 2005 17:22:11 -0000	1.1
+++ plugins.xml	29 Dec 2005 21:35:48 -0000	1.2
@@ -1,6 +1,371 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <chapter id="plugins">
-  <title>Hibernate Tools Eclipse plugin</title>
+  <title>Eclipse Plugins</title>
 
-  <para>TODO: document the plugins</para>
+  <section>
+    <title>Introduction</title>
+
+    <para>TODO: This chapter is not completely uptodate with the current
+    UI.</para>
+
+    <para></para>
+
+    <para>The following features are available in the Hibernate Tools Eclipse
+    plugins:</para>
+
+    <para><emphasis role="bold">Mapping Editor</emphasis>: An editor for
+    Hibernate XML mapping files, supporting auto-completion and syntax
+    highlighting. It also supports semantic auto-completion for class names
+    and property/field names, making it much more versatile than a normal XML
+    editor.</para>
+
+    <para><emphasis role="bold">Console:</emphasis> The console is a new view
+    in Eclipse. In addition to a tree overview of your console configurations,
+    you also get an interactive view of your persistent classes and their
+    relationships. The console allows you to execute HQL queries against your
+    database and browse the result directly in Eclipse.</para>
+
+    <para><emphasis role="bold">Development Wizards</emphasis>: Several
+    wizards are provided with the Hibernate Eclipse tools; you can use a
+    wizard to quickly generate Hibernate configuration (cfg.xml) files, or you
+    may even completely reverse engineer an existing database schema into POJO
+    source files and Hibernate mapping files. The reverse engineering wizard
+    supports customizable templates.</para>
+
+    <para>Please note that these tools do not try to hide any functionality of
+    Hibernate. The tools make working with Hibernate easier, but you are still
+    encouraged/required to read the documentation for Hibernate to fully
+    utilize Hibernate.</para>
+  </section>
+
+  <section>
+    <title>Creating a Hibernate configuration file</title>
+
+    <para>To be able to reverse engineer, prototype queries, and of course to
+    simply use Hibernate a hibernate.properties or hibernate.cfg.xml file is
+    needed. The Hibernate Tools provide a wizard for generating the
+    hibernate.cfg.xml file.</para>
+
+    <para>Start the wizard by clicking "New Wizard" (Ctrl+N), select the
+    Hibernate/Hibernate Configuration file (cfg.xml) wizard and press "Next".
+    After selecting the location for the hibernate.cfg.xml file, you will see
+    the following page:</para>
+
+    <mediaobject>
+      <imageobject role="html">
+        <imagedata align="center"
+                   fileref="../shared/images/hibernatecfgwizard.gif"
+                   format="gif" />
+      </imageobject>
+    </mediaobject>
+
+    <para>Enter your configuration information in this dialog. Details about
+    the configuration options can be found in Hibernate reference
+    documentation. Press "Finish" to create the configuration file, it will be
+    automatically opened in an editor.</para>
+
+    <para>Tip: The contents in the combo boxes for the JDBC driver class and
+    JDBC URL change automatically, depending on the Dialect and actual driver
+    you have chosen.</para>
+  </section>
+
+  <section>
+     
+
+    <title>HBM.XML Mapping Editor</title>
+
+     
+
+    <para>The XML mapping editor is based on the WTP XML editor functionallity
+    and the tool extends it to provide editing functionality as well as
+    package, class, and field completion for relevant XML attributes. The
+    auto-completion detects it's context and limits the completion for e.g.
+    &lt;property&gt; and only shows the properties/fields available in the
+    enclosing &lt;class&gt;, &lt;subclass&gt; etc.</para>
+
+     
+
+    <mediaobject>
+      <imageobject role="html">
+        <imagedata align="center"
+                   fileref="../shared/images/hbmxmlcompletion.gif"
+                   format="gif" />
+      </imageobject>
+    </mediaobject>
+
+     Context dependent code completion in the XML mapping editor 
+  </section>
+
+  <section>
+    <title>Hibernate Console perspective</title>
+
+    <para>The Hibernate Console perspective combines a set of views which
+    allow you to see the structure of your mapped entities/classes, edit HQL
+    queries, execute the queries, and see the results. To use this perspective
+    you need to create a console configuration.</para>
+
+    <section>
+       
+
+      <title>Creating a console configuration</title>
+
+       
+
+      <para>You create a console configuration by running the Console
+      Configuration wizard, shown in the following screenshot:</para>
+
+       
+
+      <mediaobject>
+        <imageobject role="html">
+          <imagedata align="center"
+                     fileref="../shared/images/consolecfgwizard.gif"
+                     format="gif" />
+        </imageobject>
+      </mediaobject>
+
+       Creating a Hibernate Console configuration 
+
+      <para>The following table describes the available settings. The wizard
+      can automatically detect default values.</para>
+
+      <para />
+
+      
+
+      <para>TODO:table Clicking "Finish" creates the configuration and shows
+      it in the Console overview.</para>
+
+       
+    </section>
+
+    <section>
+       
+
+      <title>5.2 Viewing the entity structure</title>
+
+       
+
+      <para>To view your new configuration and entity/class structure, right
+      click the configuration in the list and select "Create SessionFactory".
+      This will create a standard Hibernate <literal>SessionFactory</literal>
+      using your settings.</para>
+
+       
+
+      <para>Clicking on the small <literal>+</literal> symbol allows you to
+      browse the class/entity structure and see the relationships.</para>
+
+       
+
+      <para>Errors during creation of the <literal>SessionFactory</literal>
+      (e.g. if your configuration is incorrect) will be shown in a message
+      dialog, you may get more information about the error in the Error Log
+      view on the right pane.</para>
+
+       
+
+      <mediaobject>
+        <imageobject role="html">
+          <imagedata align="center"
+                     fileref="../shared/images/queryconsole.gif" format="gif" />
+        </imageobject>
+      </mediaobject>
+
+       Hibernate Console perspective showing entity structure, query editor and result 
+    </section>
+
+    <section>
+      <title>5.3 Prototyping Queries</title>
+
+      <para>Queries can be executed in two ways: by double clicking on entity
+      names in the tree or by entering HQL in the HQL editor and pressing the
+      green execute button.</para>
+
+      <para>Results of a query will be shown in the Query result view and
+      details of possible errors (syntax errors, database errors, etc.) can be
+      seen in the Error Log view.</para>
+
+      <para>Tip: HQL queries are executed using <literal>list()</literal> and
+      without any limit of the size of the output. Be careful if you execute a
+      query on a large result set. You might run out of memory. This will be
+      improved in a future version.</para>
+    </section>
+
+    <section>
+      <title>5.4 Properties view</title>
+
+      <para>The properties view shows the structure of any selected persistent
+      object in the results view. Editing is not yet supported.</para>
+
+      <para>The properties view is still very experimental, thus if you
+      experience issues while having it visible then close it to be able to
+      work with the remaining functionallity</para>
+    </section>
+  </section>
+
+  <section>
+     
+
+    <title>6. Reverse engineering and code generation</title>
+
+     
+
+    <para>A very simple "click-and-generate" reverse engineering and code
+    generation facility is also available. The reverse engineering internally
+    creates a Hibernate meta model. On this meta-model a set of (velocity)
+    templates are applied, generating a set of artifacts. Currently supported
+    are POJO Java source file, Hibernate *.hbm.xml, and hibernate.cfg.xml
+    generation. To start this process, choose the "Hibernate Artifact
+    Generation Wizard".</para>
+
+     
+
+    <mediaobject>
+      <imageobject role="html">
+        <imagedata align="center" fileref="../shared/images/codegenwizard.gif"
+                   format="gif" />
+      </imageobject>
+    </mediaobject>
+
+     Artifact Generation Wizard 
+
+    <para>First select which Console configuration should be used and the
+    target directory for code and mapping file generation. Note: Generation
+    will generate files, and overwrite possibly existing files in this
+    location.</para>
+
+     
+
+    <para>Now choose from the following list of options:</para>
+
+     
+
+    <section>
+      <title>Reverse engineering</title>
+
+      <para>Reverse engineering will connect to your database and read the
+      JDBC metadata of your database schema. The basic rules for the
+      conversion is that each table/view found is mapped to a POJO class, and
+      each column is mapped to a property. The package name controls the
+      "root" package of the generated classes.</para>
+
+      <para>For each found foreign key, a &lt;many-to-one&gt; and a
+      corresponding &lt;one-to-many&gt; mapping, using a
+      <literal>Set</literal>, will be created.</para>
+
+      <para>The flag "Generate 'raw' composite ids" turns on special handling
+      of composite primary keys. A &lt;composite-id&gt; mapping will always be
+      created, and if there are matching foreign-keys, a
+      &lt;key-many-to-one&gt; will be created as well. If you choose to active
+      the 'raw' composite ids, then each composite key column is considered a
+      'raw' scalar (string, long, etc.) instead of a reference to an entity.
+      Note: a &lt;many-to-one&gt; property is still created, but is simply
+      marked as non-updatable and non-insertable.</para>
+    </section>
+
+     
+
+    <section>
+      <title>POJO code generation</title>
+
+      <para>The code generation will generate all the persistent classes and
+      components found in the given Hibernate configuration.</para>
+
+      <para>You can use the code generation on your own handwritten or
+      reverse-engineered mapping files.</para>
+
+      <para>This "EJB3/JSR-220 annotations" option will activate usage of the
+      EJB3 sections in the javaclass.vm template. This is considered
+      experimental and currently incomplete. Updates to the template are
+      expected, you can even write (and hopefully contribute) more powerful
+      templates.</para>
+
+      <para>The Java code generation is based on a a complete rewrite of the
+      hbm2java found in the Hibernate 2.x toolset. This means that
+      feature-wise they should be equal, but there might be some exotic
+      &lt;meta&gt; features not fully implemented so far. Please report any
+      bugs or missing code generation features via our issue tracking
+      system.</para>
+
+      <para>Consult the Hibernate documentation for the various code
+      generation tags you can use in your mapping files.</para>
+    </section>
+
+     
+
+    <section>
+      <title>Hibernate Mapping file generation</title>
+
+      <para>This creates a hbm.xml for each class declared in the
+      configuration (and their persistent subclasses). Each &lt;subclass&gt;
+      or &lt;joined-subclass&gt; will be written to a separate mapping file,
+      an <literal>extends</literal> attribute is used.</para>
+
+      <para>The mapping file generation feature currently supports only basic
+      generation, completing the reverse engineering functionality. More
+      features will be added in the future.</para>
+    </section>
+
+     
+
+    <section>
+      <title>Hibernate configuration file generation</title>
+
+      <para>This option writes a hibernate.cfg.xml with all relevant
+      properties and with a &lt;mapping&gt; reference for each persistent
+      class</para>
+    </section>
+
+     
+
+    <section>
+      <title>Custom templates</title>
+
+      <para>All of the generated code is controlled via templates (except the
+      hibernate.cfg.xml). The wizard searches for the templates in the
+      classpath of the plugin, by default.</para>
+
+      <para>You can customize templates by placing your own .vm files in a
+      directory and naming the directory in the wizard dialog. You can
+      override existing templates by using the same file names. The built-in
+      templates can be found in the hibernate-tools.jar in the
+      org.hibernate.eclipse plugin directory.</para>
+
+      <para>You may use a pre-defined set of variables and properties in
+      templates, as shown in the following table. TODO:table</para>
+
+      <para>Note that some of these properties are only available in a certain
+      context (e.g. $property is not available at the Class level, but only fo
+      rproperties). If you need to look up some information, you have full
+      access to Hibernate's own meta-model, the
+      <literal>Configuration</literal> via $cfg. This combined with the power
+      of velocity templates should give you virtually unlimited flexibility
+      and possibilities for code generation.</para>
+
+      <para>Note that we expect significant changes to the structure and
+      organization of the built-in templates in one of the next
+      releases.</para>
+    </section>
+
+     
+
+    <section>
+      <title>Enable debug logging</title>
+
+      <para>It is possible to configure the eclipse plugin to route all
+      logging made by the plugins and hibernate code it self to the "Error
+      log" view in Eclipse.</para>
+
+      <para>This is done by editing the "hibernate-log4j.properties" in
+      org.hibernate.eclipse/ directory/jar. This file includes a default
+      configuration that only logs WARN and above to a set of custom appenders
+      (PluginFileAppender and PluginLogAppender). You can change these
+      settings to be as verbose or silent as you please - see hibernate
+      documentation for interesting categories and log4j documentation for how
+      to configure logging via a log4j property file.</para>
+    </section>
+
+     
+  </section>
 </chapter>
\ No newline at end of file

Update of /cvsroot/hibernate/HibernateExt/tools/doc/reference/en/images
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3496/doc/reference/en/images

Added Files:
	codegenwizard.gif hibernatecfgwizard.jpg consolecfgwizard.gif 
	hibernatecfgwizard.gif hbmxmlcompletion.gif queryconsole.gif 
	hbmxmlcompletion.jpg codegenwizard.jpg consolecfgwizard.jpg 
	queryconsole.jpg hibernate_logo_a.gif 
Log Message:
updated docs

--- NEW FILE: codegenwizard.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: hibernatecfgwizard.jpg ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: consolecfgwizard.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: hibernatecfgwizard.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: hbmxmlcompletion.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: queryconsole.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: hbmxmlcompletion.jpg ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: codegenwizard.jpg ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: consolecfgwizard.jpg ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: queryconsole.jpg ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: hibernate_logo_a.gif ---
(This appears to be a binary file; contents omitted.)

Update of /cvsroot/hibernate/HibernateExt/tools/doc/reference/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3496/doc/reference/en

Modified Files:
	master.xml 
Log Message:
updated docs

Index: master.xml
===================================================================
RCS file: /cvsroot/hibernate/HibernateExt/tools/doc/reference/en/master.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- master.xml	7 Nov 2005 23:05:05 -0000	1.2
+++ master.xml	29 Dec 2005 21:35:48 -0000	1.3
@@ -2,10 +2,11 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3CR3//EN"
 "../../../../../Hibernate3/doc/reference/support/docbook-dtd/docbookx.dtd" [
 <!ENTITY setup SYSTEM "modules/setup.xml">
-<!ENTITY plugins SYSTEM "modules/plugins.xml">
 <!ENTITY ant SYSTEM "modules/ant.xml">
 <!ENTITY reveng SYSTEM "modules/reverseengineering.xml">
 <!ENTITY codegen SYSTEM "modules/codegen.xml">
+<!ENTITY plugins SYSTEM "modules/plugins.xml">
+<!ENTITY codegenarchitecture SYSTEM "modules/codegenarchitecture.xml">
 ]>
 <book lang="en">
   <bookinfo>
@@ -13,7 +14,7 @@
 
     <subtitle>Reference Guide</subtitle>
 
-    <releaseinfo>3.1 beta 2</releaseinfo>
+    <releaseinfo>3.1 beta 3</releaseinfo>
 
     <mediaobject>
       <imageobject>
@@ -27,16 +28,23 @@
   <preface>
     <title>Preface</title>
 
-    <para>Hibernate Tools is a toolset for Hibernate 3 and related projects. The tools provide Ant tasks and Eclipse plugins for performing
-    reverse engineering, code generation, visualization and interaction with Hibernate.</para>
+    <para>Hibernate Tools is a toolset for Hibernate 3 and related projects.
+    The tools provide Ant tasks and Eclipse plugins for performing reverse
+    engineering, code generation, visualization and interaction with
+    Hibernate.</para>
   </preface>
 
-  &setup; 
+  &setup;
 
+  &codegenarchitecture;
+    
   &ant;
-  
+
+  &plugins;
+
   &reveng;
-  
+
   &codegen;
+  
 
 </book>
\ No newline at end of file

Update of /cvsroot/hibernate/HibernateExt/tools/lib/testlibs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6289/lib/testlibs

Modified Files:
	jboss-seam.jar 
Log Message:
update jboss-seam so unit tests of templates gets a green bar

Index: jboss-seam.jar
===================================================================
RCS file: /cvsroot/hibernate/HibernateExt/tools/lib/testlibs/jboss-seam.jar,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
Binary files /tmp/cvsI80aro and /tmp/cvsck48dk differ

Update of /cvsroot/hibernate/HibernateExt/tools/src/velocity/seam
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15634/src/velocity/seam

Modified Files:
	editorbean.java.vm screen.css.vm 
Log Message:
updated templates to current cvs rev of seam

Index: editorbean.java.vm
===================================================================
RCS file: /cvsroot/hibernate/HibernateExt/tools/src/velocity/seam/editorbean.java.vm,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- editorbean.java.vm	27 Dec 2005 01:51:45 -0000	1.21
+++ editorbean.java.vm	29 Dec 2005 14:53:04 -0000	1.22
@@ -52,7 +52,7 @@
     @${pojo.importType("org.jboss.seam.annotations.In")}(create=true)
     private transient ${pojo.importType("org.jboss.seam.core.Conversation")} conversation;
     
-    @${pojo.importType("org.jboss.seam.annotations.Begin")}
+    @${pojo.importType("org.jboss.seam.annotations.Begin")}(join=true)
     @${pojo.importType("org.jboss.seam.annotations.IfInvalid")}(outcome=${pojo.importType("org.jboss.seam.annotations.Outcome")}.REDISPLAY)
     public String create() {
 #if($pojo.identifierProperty.value.identifierGeneratorStrategy=="assigned")
@@ -137,7 +137,7 @@
 
 #set ($entitySelector="${parentPojo.shortName.toLowerCase()}Selector")
 #set ($childSelector="${pojo.shortName.toLowerCase()}${parentPojo.shortName}Selector")
-    @${pojo.importType("org.jboss.seam.annotations.Begin")}
+    @${pojo.importType("org.jboss.seam.annotations.Begin")}(join=true)
     public String select${parentPojo.shortName}() {
     	${pojo.staticImport("org.jboss.seam.ScopeType","CONVERSATION")}.getContext().set("$entitySelector",
     	      ${pojo.importType("org.jboss.seam.Component")}.getInstance("$childSelector", true) );

Index: screen.css.vm
===================================================================
RCS file: /cvsroot/hibernate/HibernateExt/tools/src/velocity/seam/screen.css.vm,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- screen.css.vm	24 Dec 2005 04:55:16 -0000	1.7
+++ screen.css.vm	29 Dec 2005 14:53:04 -0000	1.8
@@ -1,5 +1,6 @@
 body { font-family: Arial, Helvetica, sans-serif; font-size: small; }
-h1, h2, h3, h4, h5 { font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; line-height: 1em; }
+h2, h3, h4, h5 { font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; line-height: 1em; }
+h1 { font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; line-height: 1em; color: #ffffff; background-color: #004e98; margin-bottom: 4px; margin-top: 4px; }
 .rvgInputs input { display: block; width: 15em; }
 .rvgInputs select { display: block; width: 15em; }
 .rvgInputs label { clear: both; float: left; display: block; margin: 4px 0; white-space: nowrap; }
@@ -7,7 +8,7 @@
 .rvgMessages { padding: 6px; background-color: #ffd; border: 1px solid #999; margin: 10px 0; display: block; list-style: none; }
 .rvgMessage { color: red; }
 .rvgResults thead, .rvgResultsNone { font-family:  "Trebuchet MS", Arial, Helvetica, sans-serif; font-weight: bold; font-size: 1.2em; }
-.rvgResults { margin-left: 20em; padding-bottom: 40px; }
+.rvgResults { margin-left: 18em; padding-bottom: 40px; }
 .rvgResults table { width: 99%; border-collapse: collapse; }
 .rvgResults thead th { border-bottom: 1px solid #ccc; text-align: left; }
 .rvgRowOne { background-color: #f5f5f5; }
@@ -16,4 +17,4 @@
 .rvgPage { float: left; display: block; padding-top: 10px; border-top: 1px solid #ccc; }
 .rvgOrder a { text-decoration: none; }
 .rvgOrder a:hover { text-decoration: underline; color: red; }
-.rvgSwitch { display: block; padding-bottom: 15px; }
\ No newline at end of file
+.rvgSwitch { display: block; margin-bottom: 15px; background-color: #e0e0e0; width: 100%; text-align: right; margin-top: 0; }

Update of /cvsroot/hibernate/HibernateExt/ejb/src/java/org/hibernate/ejb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4439/ejb/src/java/org/hibernate/ejb

Modified Files:
	Ejb3Configuration.java 
Log Message:
EJB-84 partially plug the ClassTransformer

Index: Ejb3Configuration.java
===================================================================
RCS file: /cvsroot/hibernate/HibernateExt/ejb/src/java/org/hibernate/ejb/Ejb3Configuration.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- Ejb3Configuration.java	29 Dec 2005 13:47:19 -0000	1.21
+++ Ejb3Configuration.java	29 Dec 2005 13:51:09 -0000	1.22
@@ -41,6 +41,7 @@
 import org.hibernate.ejb.packaging.PersistenceMetadata;
 import org.hibernate.ejb.packaging.PersistenceXmlLoader;
 import org.hibernate.ejb.util.LogHelper;
+import org.hibernate.ejb.instrument.InterceptFieldClassFileTransformer;
 import org.hibernate.engine.FilterDefinition;
 import org.hibernate.event.EventListeners;
 import org.hibernate.mapping.AuxiliaryDatabaseObject;
@@ -214,7 +215,7 @@
 			if ( detectArtifact[1] ) scanForHbmXmlFiles( info.getPersistenceUnitRootUrl(), hbmFiles );
 		}
 		//FIXME send the appropriate entites.
-		//info.addTransformer( new InterceptFieldClassFileTransformer(entities) );
+		info.addTransformer( new InterceptFieldClassFileTransformer(entities) );
 		Properties props = info.getProperties() != null ?
 				info.getProperties() :
 				new Properties( );

Update of /cvsroot/hibernate/HibernateExt/ejb/src/java/org/hibernate/ejb/instrument
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4439/ejb/src/java/org/hibernate/ejb/instrument

Modified Files:
	InterceptFieldClassFileTransformer.java 
Log Message:
EJB-84 partially plug the ClassTransformer

Index: InterceptFieldClassFileTransformer.java
===================================================================
RCS file: /cvsroot/hibernate/HibernateExt/ejb/src/java/org/hibernate/ejb/instrument/InterceptFieldClassFileTransformer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- InterceptFieldClassFileTransformer.java	29 Dec 2005 13:47:20 -0000	1.2
+++ InterceptFieldClassFileTransformer.java	29 Dec 2005 13:51:09 -0000	1.3
@@ -4,7 +4,6 @@
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.lang.instrument.ClassFileTransformer;
 import java.lang.instrument.IllegalClassFormatException;
 import java.security.ProtectionDomain;
 import java.util.Arrays;
@@ -32,7 +31,7 @@
  *
  * @author Emmanuel Bernard
  */
-public class InterceptFieldClassFileTransformer implements ClassFileTransformer {
+public class InterceptFieldClassFileTransformer implements javax.persistence.spi.ClassTransformer {
 	Log log = LogFactory.getLog( InterceptFieldClassFileTransformer.class.getName() );
 	private List<String> entities;

Update of /cvsroot/hibernate/HibernateExt/ejb/src/test/org/hibernate/ejb/test/connection
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3663/ejb/src/test/org/hibernate/ejb/test/connection

Modified Files:
	PersistenceUnitInfoImpl.java 
Log Message:
EJB-83 need to be polished though

Index: PersistenceUnitInfoImpl.java
===================================================================
RCS file: /cvsroot/hibernate/HibernateExt/ejb/src/test/org/hibernate/ejb/test/connection/PersistenceUnitInfoImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- PersistenceUnitInfoImpl.java	29 Dec 2005 02:41:45 -0000	1.1
+++ PersistenceUnitInfoImpl.java	29 Dec 2005 13:47:20 -0000	1.2
@@ -1,25 +1,26 @@
 //$Id$
 package org.hibernate.ejb.test.connection;
 
+import java.net.URL;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
-import java.util.ArrayList;
-import java.net.URL;
+import javax.persistence.spi.ClassTransformer;
 import javax.persistence.spi.PersistenceUnitInfo;
 import javax.persistence.spi.PersistenceUnitTransactionType;
-import javax.persistence.spi.ClassTransformer;
 import javax.sql.DataSource;
 
+import org.hibernate.cfg.Environment;
 import org.hibernate.ejb.HibernatePersistence;
-import org.hibernate.ejb.test.Item;
 import org.hibernate.ejb.test.Distributor;
-import org.hibernate.cfg.Environment;
+import org.hibernate.ejb.test.Item;
 
 /**
  * @author Emmanuel Bernard
  */
 public class PersistenceUnitInfoImpl implements PersistenceUnitInfo {
 	private Properties properties = new Properties();
+
 	public String getPersistenceUnitName() {
 		return "persistenceinfo";
 	}
@@ -52,7 +53,7 @@
 	}
 
 	public Properties getProperties() {
-		properties.setProperty( Environment.HBM2DDL_AUTO, "create-drop");
+		properties.setProperty( Environment.HBM2DDL_AUTO, "create-drop" );
 		return properties;
 	}
 
@@ -60,27 +61,22 @@
 		return Thread.currentThread().getContextClassLoader();
 	}
 
-   public PersistenceUnitTransactionType getTransactionType()
-   {
-      return null;
-   }
+	public PersistenceUnitTransactionType getTransactionType() {
+		return null;
+	}
 
-   public URL getPersistenceUnitRootUrl()
-   {
-      return null;
-   }
+	public URL getPersistenceUnitRootUrl() {
+		return null;
+	}
 
-   public boolean excludeUnlistedClasses()
-   {
-      return false;
-   }
+	public boolean excludeUnlistedClasses() {
+		return true;
+	}
 
-   public void addTransformer(ClassTransformer transformer)
-   {
-   }
+	public void addTransformer(ClassTransformer transformer) {
+	}
 
-   public ClassLoader getNewTempClassLoader()
-   {
-      return null;
-   }
+	public ClassLoader getNewTempClassLoader() {
+		return null;
+	}
 }

Update of /cvsroot/hibernate/HibernateExt/ejb/src/test/org/hibernate/ejb/test/instrument
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3663/ejb/src/test/org/hibernate/ejb/test/instrument

Modified Files:
	InstrumentedClassLoader.java 
	InterceptFieldClassFileTransformerTest.java 
Log Message:
EJB-83 need to be polished though

Index: InstrumentedClassLoader.java
===================================================================
RCS file: /cvsroot/hibernate/HibernateExt/ejb/src/test/org/hibernate/ejb/test/instrument/InstrumentedClassLoader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- InstrumentedClassLoader.java	7 Sep 2005 22:42:31 -0000	1.1
+++ InstrumentedClassLoader.java	29 Dec 2005 13:47:20 -0000	1.2
@@ -4,6 +4,7 @@
 import java.io.InputStream;
 import java.io.IOException;
 import java.lang.instrument.IllegalClassFormatException;
+import java.util.List;
 
 import org.hibernate.ejb.instrument.InterceptFieldClassFileTransformer;
 
@@ -11,6 +12,8 @@
  * @author Emmanuel Bernard
  */
 public class InstrumentedClassLoader extends ClassLoader {
+	private List<String> entities;
+
 	public InstrumentedClassLoader(ClassLoader parent) {
 		super( parent );
 	}
@@ -49,7 +52,7 @@
 		catch (IOException e) {
 			throw new ClassNotFoundException(name + " not found", e);
 		}
-		InterceptFieldClassFileTransformer t = new InterceptFieldClassFileTransformer();
+		InterceptFieldClassFileTransformer t = new InterceptFieldClassFileTransformer(entities);
 		byte[] transformed = new byte[0];
 		try {
 			transformed = t.transform(
@@ -66,4 +69,8 @@
 
 		return defineClass( name, transformed, 0, transformed.length);
 	}
+
+	public void setEntities(List<String> entities) {
+		this.entities = entities;
+	}
 }

Index: InterceptFieldClassFileTransformerTest.java
===================================================================
RCS file: /cvsroot/hibernate/HibernateExt/ejb/src/test/org/hibernate/ejb/test/instrument/InterceptFieldClassFileTransformerTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- InterceptFieldClassFileTransformerTest.java	7 Sep 2005 22:42:31 -0000	1.1
+++ InterceptFieldClassFileTransformerTest.java	29 Dec 2005 13:47:20 -0000	1.2
@@ -1,6 +1,9 @@
 //$Id$
 package org.hibernate.ejb.test.instrument;
 
+import java.util.List;
+import java.util.ArrayList;
+
 import junit.framework.TestCase;
 
 /**
@@ -8,10 +11,13 @@
  */
 public class InterceptFieldClassFileTransformerTest extends TestCase {
 	public void testEnhancement() throws Exception {
+		List<String> entities = new ArrayList<String>();
+		entities.add( "org.hibernate.ejb.test.instrument.Simple");
 		InstrumentedClassLoader cl = new InstrumentedClassLoader( Thread.currentThread().getContextClassLoader() );
+		cl.setEntities(entities);
 		Class interceptedFieldEnabled = cl.loadClass( "net.sf.cglib.transform.impl.InterceptFieldEnabled" );
-		Class clazz = cl.loadClass( "org.hibernate.ejb.test.instrument.Simple" );
-		clazz = cl.loadClass( "org.hibernate.ejb.test.instrument.Simple" );
+		Class clazz = cl.loadClass( entities.get(0) );
+		//clazz = cl.loadClass( "org.hibernate.ejb.test.instrument.Simple" );
 		assertTrue( interceptedFieldEnabled.isAssignableFrom( clazz ) );
 		clazz.getName();
 	}

Update of /cvsroot/hibernate/HibernateExt/ejb/src/java/org/hibernate/ejb/packaging
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3663/ejb/src/java/org/hibernate/ejb/packaging

Modified Files:
	PersistenceMetadata.java PersistenceXmlLoader.java 
Log Message:
EJB-83 need to be polished though

Index: PersistenceMetadata.java
===================================================================
RCS file: /cvsroot/hibernate/HibernateExt/ejb/src/java/org/hibernate/ejb/packaging/PersistenceMetadata.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- PersistenceMetadata.java	29 Dec 2005 02:41:45 -0000	1.6
+++ PersistenceMetadata.java	29 Dec 2005 13:47:20 -0000	1.7
@@ -1,11 +1,11 @@
 package org.hibernate.ejb.packaging;
 
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Properties;
 import java.util.Set;
-import java.io.InputStream;
 
 /**
  * Simple represenation of persistence.xml
@@ -15,20 +15,20 @@
  */
 public class PersistenceMetadata {
 
-   private String name;
-	private String datasource;
+	private String name;
+	private String nonJtaDatasource;
 	private String jtaDatasource;
 	private String provider;
-   private String transactionType;
-   private List<String> classes = new ArrayList<String>();
+	private String transactionType;
+	private List<String> classes = new ArrayList<String>();
 	private List<String> packages = new ArrayList<String>();
 	private List<String> mappingFiles = new ArrayList<String>();
 	private Set<String> jarFiles = new HashSet<String>();
 	private List<InputStream> hbmfiles = new ArrayList<InputStream>();
 	private Properties props = new Properties();
-   private boolean excludeUnlistedClasses = false;
+	private boolean excludeUnlistedClasses = false;
 
-   public String getName() {
+	public String getName() {
 		return name;
 	}
 
@@ -36,22 +36,20 @@
 		this.name = name;
 	}
 
-   public String getTransactionType()
-   {
-      return transactionType;
-   }
-
-   public void setTransactionType(String transactionType)
-   {
-      this.transactionType = transactionType;
-   }
+	public String getTransactionType() {
+		return transactionType;
+	}
 
-   public String getDatasource() {
-		return datasource;
+	public void setTransactionType(String transactionType) {
+		this.transactionType = transactionType;
+	}
+	//TODO use this
+	public String getNonJtaDatasource() {
+		return nonJtaDatasource;
 	}
 
-	public void setDatasource(String datasource) {
-		this.datasource = datasource;
+	public void setNonJtaDatasource(String nonJtaDatasource) {
+		this.nonJtaDatasource = nonJtaDatasource;
 	}
 
 	public String getJtaDatasource() {
@@ -118,13 +116,11 @@
 		this.hbmfiles = hbmfiles;
 	}
 
-   public boolean getExcludeUnlistedClasses()
-   {
-      return excludeUnlistedClasses;
-   }
+	public boolean getExcludeUnlistedClasses() {
+		return excludeUnlistedClasses;
+	}
 
-   public void setExcludeUnlistedClasses(boolean excludeUnlistedClasses)
-   {
-      this.excludeUnlistedClasses = excludeUnlistedClasses;
-   }
+	public void setExcludeUnlistedClasses(boolean excludeUnlistedClasses) {
+		this.excludeUnlistedClasses = excludeUnlistedClasses;
+	}
 }

Index: PersistenceXmlLoader.java
===================================================================
RCS file: /cvsroot/hibernate/HibernateExt/ejb/src/java/org/hibernate/ejb/packaging/PersistenceXmlLoader.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- PersistenceXmlLoader.java	29 Dec 2005 02:41:45 -0000	1.5
+++ PersistenceXmlLoader.java	29 Dec 2005 13:47:20 -0000	1.6
@@ -82,7 +82,7 @@
                metadata.setName( puName );
             }
             else if ( tag.equals( "non-jta-data-source" ) ) {
-               metadata.setDatasource( XmlHelper.getElementContent( element ) );
+               metadata.setNonJtaDatasource( XmlHelper.getElementContent( element ) );
             }
             else if ( tag.equals( "jta-data-source" ) ) {
                metadata.setJtaDatasource( XmlHelper.getElementContent( element ) );

Update of /cvsroot/hibernate/HibernateExt/ejb/src/java/org/hibernate/ejb/instrument
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3663/ejb/src/java/org/hibernate/ejb/instrument

Modified Files:
	InterceptFieldClassFileTransformer.java 
Log Message:
EJB-83 need to be polished though

Index: InterceptFieldClassFileTransformer.java
===================================================================
RCS file: /cvsroot/hibernate/HibernateExt/ejb/src/java/org/hibernate/ejb/instrument/InterceptFieldClassFileTransformer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- InterceptFieldClassFileTransformer.java	7 Sep 2005 22:42:31 -0000	1.1
+++ InterceptFieldClassFileTransformer.java	29 Dec 2005 13:47:20 -0000	1.2
@@ -8,6 +8,7 @@
 import java.lang.instrument.IllegalClassFormatException;
 import java.security.ProtectionDomain;
 import java.util.Arrays;
+import java.util.List;
 
 import net.sf.cglib.core.ClassNameReader;
 import net.sf.cglib.core.DebuggingClassWriter;
@@ -33,6 +34,11 @@
  */
 public class InterceptFieldClassFileTransformer implements ClassFileTransformer {
 	Log log = LogFactory.getLog( InterceptFieldClassFileTransformer.class.getName() );
+	private List<String> entities;
+
+	public InterceptFieldClassFileTransformer(List<String> entities) {
+		this.entities = entities;
+	}
 
 	public byte[]
 			transform(
@@ -48,13 +54,21 @@
 			throw new IllegalClassFormatException( "Unable to read class: " + e.getMessage() );
 		}
 
+//		if ( className.startsWith( "net/sf/cglib")
+//				|| className.startsWith( "org/hibernate/ejb/instrument")
+//				|| className.startsWith( "org/hibernate/proxy")
+//				|| className.startsWith( "org/hibernate/intercept") ) {
+//			return classfileBuffer;
+//		}
+		
+		if ( ! entities.contains( className.replace( "/", "." ) ) ) return classfileBuffer;
 
 		String name[] = ClassNameReader.getClassInfo( reader );
 		ClassWriter w = new DebuggingClassWriter( true );
 		ClassTransformer t = getClassTransformer( name );
 		if ( t != null ) {
 			if ( log.isDebugEnabled() ) {
-				log.debug( "Enhancing " + className );
+				log.info( "Enhancing " + className );
 			}
 			ByteArrayOutputStream out;
 			byte[] result;

Update of /cvsroot/hibernate/HibernateExt/ejb/src/java/org/hibernate/ejb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3663/ejb/src/java/org/hibernate/ejb

Modified Files:
	Ejb3Configuration.java HibernatePersistence.java 
Log Message:
EJB-83 need to be polished though

Index: Ejb3Configuration.java
===================================================================
RCS file: /cvsroot/hibernate/HibernateExt/ejb/src/java/org/hibernate/ejb/Ejb3Configuration.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- Ejb3Configuration.java	29 Dec 2005 04:15:31 -0000	1.20
+++ Ejb3Configuration.java	29 Dec 2005 13:47:19 -0000	1.21
@@ -40,6 +40,7 @@
 import org.hibernate.ejb.packaging.JarVisitor;
 import org.hibernate.ejb.packaging.PersistenceMetadata;
 import org.hibernate.ejb.packaging.PersistenceXmlLoader;
+import org.hibernate.ejb.util.LogHelper;
 import org.hibernate.engine.FilterDefinition;
 import org.hibernate.event.EventListeners;
 import org.hibernate.mapping.AuxiliaryDatabaseObject;
@@ -105,7 +106,7 @@
 		Properties props = new Properties();
 		props.putAll( metadata.getProps() );
 		if ( overrides != null ) props.putAll( overrides ); //yuk!
-		return createEntityManagerFactory( props, workingVars );
+		return createEntityManagerFactory( props, workingVars, null );
 	}
 
 	/**
@@ -192,8 +193,14 @@
 	 * Create a factory from a PersistenceInfo object
 	 */
 	public EntityManagerFactory createContainerEntityManagerFactory(PersistenceUnitInfo info) {
-		List<String> entities = info.getManagedClassNames();
-		if ( entities == null ) entities = new ArrayList<String>();
+		if ( log.isDebugEnabled() ) {
+			log.debug( "Processing " + LogHelper.logPersistenceUnitInfo( info ) );
+		}
+		else {
+			log.info( "Processing PersistenceUnitInfo [\n\tname: " + info.getPersistenceUnitName() + "\n\t...]");
+		}
+		List<String> entities = new ArrayList( 50 );
+		if ( info.getManagedClassNames() != null ) entities.addAll( info.getManagedClassNames() );
 		List<InputStream> hbmFiles = new ArrayList<InputStream>();
 		List<String> packages = new ArrayList<String>();
 		Map workingVars = new HashMap();
@@ -202,14 +209,15 @@
 			if ( detectArtifact[0] ) scanForClasses( jar, packages, entities );
 			if ( detectArtifact[1] ) scanForHbmXmlFiles( jar, hbmFiles );
 		}
-      if (!info.excludeUnlistedClasses())
-      {
-         if (detectArtifact[0]) scanForClasses(info.getPersistenceUnitRootUrl(), packages, entities);
-         if (detectArtifact[1]) scanForHbmXmlFiles(info.getPersistenceUnitRootUrl(), hbmFiles);
-      }
-
-      Properties props = info.getProperties();
-		if ( props == null ) props = new Properties();
+		if ( ! info.excludeUnlistedClasses() ) {
+			if ( detectArtifact[0] ) scanForClasses( info.getPersistenceUnitRootUrl(), packages, entities );
+			if ( detectArtifact[1] ) scanForHbmXmlFiles( info.getPersistenceUnitRootUrl(), hbmFiles );
+		}
+		//FIXME send the appropriate entites.
+		//info.addTransformer( new InterceptFieldClassFileTransformer(entities) );
+		Properties props = info.getProperties() != null ?
+				info.getProperties() :
+				new Properties( );
 		workingVars.put( HibernatePersistence.CLASS_NAMES, entities );
 		workingVars.put( HibernatePersistence.PACKAGE_NAMES, packages );
 		if ( hbmFiles.size() > 0 ) workingVars.put( HibernatePersistence.HBXML_FILES, hbmFiles );
@@ -219,7 +227,7 @@
 			);
 			this.setProperty( Environment.CONNECTION_PROVIDER, InjectedDataSourceConnectionProvider.class.getName() );
 		}
-		return createEntityManagerFactory( props, workingVars );
+		return createEntityManagerFactory( props, workingVars, info.getClassLoader() );
 
 	}
 
@@ -368,14 +376,14 @@
 			props.remove( HibernatePersistence.HBXML_FILES );
 			props.remove( HibernatePersistence.LOADED_CLASSES );
 		}
-		return createEntityManagerFactory( props, workingVars );
+		return createEntityManagerFactory( props, workingVars, null );
 	}
 
 	/**
 	 * Create an EntityManagerFactory <b>when</b> the configuration is ready
 	 */
 	public EntityManagerFactory createEntityManagerFactory() {
-		return createEntityManagerFactory( cfg.getProperties(), new HashMap() );
+		return createEntityManagerFactory( cfg.getProperties(), new HashMap(), null );
 	}
 
 	private EntityManagerFactory buildEntityManagerFactory() {
@@ -385,7 +393,9 @@
 	/**
 	 * create a factory from a canonical workingVars map and the overriden properties
 	 */
-	private EntityManagerFactory createEntityManagerFactory(Properties properties, Map workingVars) {
+	private EntityManagerFactory createEntityManagerFactory(
+			Properties properties, Map workingVars, ClassLoader classLoader
+	) {
 		Properties preparedProperties = new Properties();
 
 		//defaults different to Hibernate
@@ -409,7 +419,7 @@
 			Collection<String> classNames = (Collection<String>) workingVars.get(
 					HibernatePersistence.CLASS_NAMES
 			);
-			addNamedAnnotatedClasses( this, classNames );
+			addNamedAnnotatedClasses( this, classNames, classLoader );
 		}
 		if ( workingVars.containsKey( HibernatePersistence.LOADED_CLASSES ) ) {
 			Collection<Class> classes = (Collection<Class>) workingVars.get( HibernatePersistence.LOADED_CLASSES );
@@ -422,6 +432,7 @@
 					HibernatePersistence.PACKAGE_NAMES
 			);
 			for ( String pkg : packages ) {
+				//FIXME classloader
 				cfg.addPackage( pkg );
 			}
 		}
@@ -465,7 +476,7 @@
 						//cfg.setInterceptor has precedence over configuration file
 						String interceptorName = properties.getProperty( HibernatePersistence.INTERCEPTOR );
 						try {
-							Class interceptor = ReflectHelper.classForName( interceptorName, this.getClass() );
+							Class interceptor = classForName( interceptorName, classLoader );
 							cfg.setInterceptor( (Interceptor) interceptor.newInstance() );
 						}
 						catch (ClassNotFoundException e) {
@@ -493,7 +504,7 @@
 						//cfg.setNamingStrategy has precedence over configuration file
 						String namingStrategyName = properties.getProperty( HibernatePersistence.NAMING_STRATEGY );
 						try {
-							Class namingStragegy = ReflectHelper.classForName( namingStrategyName, this.getClass() );
+							Class namingStragegy = classForName( namingStrategyName, classLoader );
 							cfg.setNamingStrategy( (NamingStrategy) namingStragegy.newInstance() );
 						}
 						catch (ClassNotFoundException e) {
@@ -540,6 +551,18 @@
 		return buildEntityManagerFactory();
 	}
 
+	private Class classForName(
+			String className, ClassLoader classLoader
+	) throws ClassNotFoundException {
+		//TODO optimize by caching the classloader?
+		if (classLoader != null) {
+			return classLoader.loadClass( className );
+		}
+		else {
+			return ReflectHelper.classForName( className, this.getClass() );
+		}
+	}
+
 	private void setCacheStrategy(String propertyKey, Map properties, boolean isClass) {
 		String role = propertyKey.substring(
 				( isClass ? HibernatePersistence.CLASS_CACHE_PREFIX
@@ -603,10 +626,10 @@
 		}
 	}
 
-	private void addNamedAnnotatedClasses(Ejb3Configuration cfg, Collection<String> classNames) {
+	private void addNamedAnnotatedClasses(Ejb3Configuration cfg, Collection<String> classNames, ClassLoader classLoader) {
 		for ( String name : classNames ) {
 			try {
-				Class clazz = ReflectHelper.classForName( name );
+				Class clazz = classForName( name, classLoader );
 				cfg.addAnnotatedClass( clazz );
 			}
 			catch (ClassNotFoundException cnfe) {

Index: HibernatePersistence.java
===================================================================
RCS file: /cvsroot/hibernate/HibernateExt/ejb/src/java/org/hibernate/ejb/HibernatePersistence.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- HibernatePersistence.java	29 Dec 2005 02:41:45 -0000	1.44
+++ HibernatePersistence.java	29 Dec 2005 13:47:20 -0000	1.45
@@ -24,7 +24,7 @@
 	public static final String CLASS_NAMES = "hibernate.ejb.classes";
 	/**
 	 * List of annotated packages
-     * Internal use only
+	 * Internal use only
 	 */
 	public static final String PACKAGE_NAMES = "hibernate.ejb.packages";
 	/**

Update of /cvsroot/hibernate/HibernateExt/ejb-api/src/javax/persistence
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2837/ejb-api/src/javax/persistence

Modified Files:
	TableGenerator.java 
Log Message:
ANN-190
EJB-83 need to be polished though

Index: TableGenerator.java
===================================================================
RCS file: /cvsroot/hibernate/HibernateExt/ejb-api/src/javax/persistence/TableGenerator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- TableGenerator.java	5 Mar 2005 19:58:07 -0000	1.2
+++ TableGenerator.java	29 Dec 2005 13:42:33 -0000	1.3
@@ -2,19 +2,28 @@
 //EJB3 Specification Copyright 2004, 2005 Sun Microsystems, Inc.
 package javax.persistence;
 
+import static java.lang.annotation.ElementType.*;
 import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Target;
 
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.*;
-
 /**
  * @author Emmanuel Bernard
  */
-@..., TYPE, METHOD, FIELD}) @Retention(RUNTIME)
+@Target({PACKAGE, TYPE, METHOD, FIELD})
+@Retention(RUNTIME)
 public @interface TableGenerator {
 	String name();
-	String tableName() default "";
+
+	Table table() default @Table(specified = false);
+
+	String pkColumnName() default "";
+
+	String valueColumnName() default "";
+
 	String pkColumnValue() default "";
+
+	int initialValue() default 0;
+
 	int allocationSize() default 50;
 }

Update of /cvsroot/hibernate/HibernateExt/metadata/src/test/org/hibernate/test/annotations/id
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2548/metadata/src/test/org/hibernate/test/annotations/id

Modified Files:
	Ball.java Department.java Dog.java Shoe.java Store.java 
Log Message:
ANN-190

Index: Ball.java
===================================================================
RCS file: /cvsroot/hibernate/HibernateExt/metadata/src/test/org/hibernate/test/annotations/id/Ball.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Ball.java	12 May 2005 13:33:32 -0000	1.1
+++ Ball.java	29 Dec 2005 13:40:38 -0000	1.2
@@ -1,16 +1,18 @@
 //$Id$
 package org.hibernate.test.annotations.id;
 
+import java.io.Serializable;
 import javax.persistence.Entity;
 import javax.persistence.GeneratorType;
 import javax.persistence.Id;
+import javax.persistence.Table;
 import javax.persistence.TableGenerator;
-import java.io.Serializable;
 /**
  * Sample of table generator
  * @author Emmanuel Bernard
  */
-@...", tableName="GEN_TABLE", pkColumnValue="Ball", allocationSize=10)
+@TableGenerator(name="EMP_GEN", table = @Table(name="GENERATOR_TABLE"), pkColumnName = "key",
+	valueColumnName = "hi", pkColumnValue="Ball", allocationSize=10)
 @Entity
 public class Ball implements Serializable {
 	private Integer id;

Index: Department.java
===================================================================
RCS file: /cvsroot/hibernate/HibernateExt/metadata/src/test/org/hibernate/test/annotations/id/Department.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Department.java	12 May 2005 13:33:32 -0000	1.1
+++ Department.java	29 Dec 2005 13:40:39 -0000	1.2
@@ -1,10 +1,10 @@
 //$Id$
 package org.hibernate.test.annotations.id;
 
+import java.io.Serializable;
 import javax.persistence.Entity;
 import javax.persistence.GeneratorType;
 import javax.persistence.Id;
-import java.io.Serializable;
 
 /**
  * Sample of method generator

Index: Dog.java
===================================================================
RCS file: /cvsroot/hibernate/HibernateExt/metadata/src/test/org/hibernate/test/annotations/id/Dog.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Dog.java	13 Sep 2005 16:00:37 -0000	1.2
+++ Dog.java	29 Dec 2005 13:40:39 -0000	1.3
@@ -14,7 +14,8 @@
  */
 @Entity
 @Table(name="tbl_dog")
-@...", tableName="GEN_TABLE", pkColumnValue="Dog", allocationSize=10)
+@TableGenerator(name="DogGen", table = @Table(name="GENERATOR_TABLE"), pkColumnName = "key",
+	valueColumnName = "hi", pkColumnValue="Dog", allocationSize=10)
 public class Dog {
 	private Integer id;
 	private String name;

Index: Shoe.java
===================================================================
RCS file: /cvsroot/hibernate/HibernateExt/metadata/src/test/org/hibernate/test/annotations/id/Shoe.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Shoe.java	12 May 2005 13:33:32 -0000	1.1
+++ Shoe.java	29 Dec 2005 13:40:39 -0000	1.2
@@ -1,10 +1,10 @@
 //$Id$
 package org.hibernate.test.annotations.id;
 
+import java.io.Serializable;
 import javax.persistence.Entity;
 import javax.persistence.GeneratorType;
 import javax.persistence.Id;
-import java.io.Serializable;
 
 /**
  * sample of Sequance generator

Index: Store.java
===================================================================
RCS file: /cvsroot/hibernate/HibernateExt/metadata/src/test/org/hibernate/test/annotations/id/Store.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Store.java	12 May 2005 13:33:32 -0000	1.1
+++ Store.java	29 Dec 2005 13:40:39 -0000	1.2
@@ -1,10 +1,10 @@
 //$Id$
 package org.hibernate.test.annotations.id;
 
+import java.io.Serializable;
 import javax.persistence.Entity;
 import javax.persistence.GeneratorType;
 import javax.persistence.Id;
-import java.io.Serializable;
 
 /**
  * Sample of class generator

Update of /cvsroot/hibernate/HibernateExt/metadata/src/test/org/hibernate/test/annotations
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2548/metadata/src/test/org/hibernate/test/annotations

Modified Files:
	package-info.java 
Log Message:
ANN-190

Index: package-info.java
===================================================================
RCS file: /cvsroot/hibernate/HibernateExt/metadata/src/test/org/hibernate/test/annotations/package-info.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- package-info.java	12 May 2005 13:33:52 -0000	1.1
+++ package-info.java	29 Dec 2005 13:40:39 -0000	1.2
@@ -3,18 +3,13 @@
  * It contains an example of package level metadata
  */
 
-
 @TableGenerator(
 	name="EMP_GEN",
-	tableName="GEN_TABLE",
-	pkColumnValue="EMP",
-	allocationSize=20
-)
-@...(
-	name="GEN_TABLE",
 	table = @Table(name="GENERATOR_TABLE"),
 	pkColumnName = "key",
-	valueColumnName = "hi"
+	valueColumnName = "hi",
+	pkColumnValue="EMP",
+	allocationSize=20
 )
 @SequenceGenerator(
 	name="SEQ_GEN",
@@ -22,7 +17,6 @@
 )
 package org.hibernate.test.annotations;
 
-import javax.persistence.GeneratedIdTable;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import javax.persistence.TableGenerator;

Update of /cvsroot/hibernate/HibernateExt/metadata/src/java/org/hibernate/cfg
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2548/metadata/src/java/org/hibernate/cfg

Modified Files:
	AnnotationBinder.java 
Log Message:
ANN-190

Index: AnnotationBinder.java
===================================================================
RCS file: /cvsroot/hibernate/HibernateExt/metadata/src/java/org/hibernate/cfg/AnnotationBinder.java,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -d -r1.153 -r1.154
--- AnnotationBinder.java	19 Dec 2005 19:01:24 -0000	1.153
+++ AnnotationBinder.java	29 Dec 2005 13:40:38 -0000	1.154
@@ -23,7 +23,6 @@
 import javax.persistence.EmbeddedId;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
-import javax.persistence.GeneratedIdTable;
 import javax.persistence.GeneratorType;
 import javax.persistence.Id;
 import javax.persistence.IdClass;
@@ -125,7 +124,6 @@
  * @author Emmanuel Bernard
  */
 public final class AnnotationBinder {
-	private static final String GENERATOR_TABLE_NAME_PARAM = "generatorTableName";
 	public static final String ANNOTATION_STRING_DEFAULT = "";
 
 	/*
@@ -169,11 +167,11 @@
 			mappings.addGenerator( idGen );
 
 		}
-		if ( pckg.isAnnotationPresent( GeneratedIdTable.class ) ) {
-			GeneratedIdTable ann = pckg.getAnnotation( GeneratedIdTable.class );
-			Properties params = buildPropertiesFromGeneratorTable( ann );
-			mappings.addGeneratorTable( ann.name(), params );
-		}
+//		if ( pckg.isAnnotationPresent( GeneratedIdTable.class ) ) {
+//			GeneratedIdTable ann = pckg.getAnnotation( GeneratedIdTable.class );
+//			Properties params = buildPropertiesFromGeneratorTable( ann );
+//			mappings.addGeneratorTable( ann.name(), params );
+//		}
 		if ( pckg.isAnnotationPresent( GenericGenerator.class ) ) {
 			GenericGenerator ann = pckg.getAnnotation( GenericGenerator.class );
 			IdGenerator idGen = buildIdGenerator( ann, mappings );
@@ -231,33 +229,6 @@
 		}
 	}
 
-	private static Properties buildPropertiesFromGeneratorTable(GeneratedIdTable ann) {
-		Properties params = new Properties();
-		if ( ! isDefault( ann.pkColumnName() ) ) {
-			params.setProperty( MultipleHiLoPerTableGenerator.PK_COLUMN_NAME, ann.pkColumnName() );
-		}
-		if ( ! isDefault( ann.valueColumnName() ) ) {
-			params.setProperty( MultipleHiLoPerTableGenerator.VALUE_COLUMN_NAME, ann.valueColumnName() );
-		}
-		if ( ann.table().specified() ) {
-			javax.persistence.Table table = ann.table();
-			if ( ! isDefault( table.name() ) ) {
-				params.setProperty( MultipleHiLoPerTableGenerator.ID_TABLE, table.name() );
-			}
-			if ( ! isDefault( table.catalog() ) ) {
-				params.setProperty( MultipleHiLoPerTableGenerator.CATALOG, table.catalog() );
-			}
-			if ( ! isDefault( table.schema() ) ) {
-				params.setProperty( MultipleHiLoPerTableGenerator.SCHEMA, table.schema() );
-			}
-			//FIXME implements uniqueconstrains
-		}
-		else {
-			params.setProperty( MultipleHiLoPerTableGenerator.ID_TABLE, ann.name() );
-		}
-		return params;
-	}
-
 	private static IdGenerator buildIdGenerator(java.lang.annotation.Annotation ann, Mappings mappings) {
 		IdGenerator idGen = new IdGenerator();
 		if ( mappings.getSchemaName() != null ) {
@@ -273,8 +244,30 @@
 			TableGenerator tabGen = (TableGenerator) ann;
 			idGen.setName( tabGen.name() );
 			idGen.setIdentifierGeneratorStrategy( MultipleHiLoPerTableGenerator.class.getName() );
-			if ( !isDefault( tabGen.tableName() ) ) {
-				idGen.addParam( GENERATOR_TABLE_NAME_PARAM, tabGen.tableName() );
+			javax.persistence.Table tableAnn = tabGen.table();
+			if ( tableAnn.specified() ) {
+				if ( !isDefault( tableAnn.name() ) ) {
+					idGen.addParam( MultipleHiLoPerTableGenerator.ID_TABLE, tableAnn.name() );
+				}
+				else {
+					//idGen.addParam( MultipleHiLoPerTableGenerator.ID_TABLE, tabGen.name() );
+				}
+				if ( ! isDefault( tableAnn.catalog() ) ) {
+					idGen.addParam( MultipleHiLoPerTableGenerator.CATALOG, tableAnn.catalog() );
+				}
+				if ( ! isDefault( tableAnn.schema() ) ) {
+					idGen.addParam( MultipleHiLoPerTableGenerator.SCHEMA, tableAnn.schema() );
+				}
+				//FIXME implements uniqueconstrains
+			}
+			else {
+				//idGen.addParam( MultipleHiLoPerTableGenerator.ID_TABLE, tabGen.name() );
+			}
+			if ( ! isDefault( tabGen.pkColumnName() ) ) {
+				idGen.addParam( MultipleHiLoPerTableGenerator.PK_COLUMN_NAME, tabGen.pkColumnName() );
+			}
+			if ( ! isDefault( tabGen.valueColumnName() ) ) {
+				idGen.addParam( MultipleHiLoPerTableGenerator.VALUE_COLUMN_NAME, tabGen.valueColumnName() );
 			}
 			if ( !isDefault( tabGen.pkColumnValue() ) ) {
 				idGen.addParam( MultipleHiLoPerTableGenerator.PK_VALUE_NAME, tabGen.pkColumnValue() );
@@ -556,7 +549,6 @@
 
 		//try to find class level generators
 		HashMap<String, IdGenerator> classGenerators = buildLocalGenerators( annotatedClass, mappings );
-		HashMap<String, Properties> classGeneratorTables = buildLocalGeneratorTable( annotatedClass );
 		//process idclass if any
 		Set<String> idProperties = new HashSet<String>();
 		if ( annotatedClass.isAnnotationPresent( IdClass.class ) ) {
@@ -572,7 +564,6 @@
 					propertyAccess == true ? "property" : "field", "id", compositeClass
 			);
 			HashMap<String, IdGenerator> localGenerators = new HashMap<String, IdGenerator>();
-			HashMap<String, Properties> localGeneratorTables = new HashMap<String, Properties>();
 			bindId(
 					generatorType,
 					generator,
@@ -580,7 +571,6 @@
 					null,
 					propertyHolder,
 					localGenerators,
-					localGeneratorTables,
 					isComponent,
 					columnOverride,
 					propertyAccess,
@@ -655,7 +645,7 @@
 						propertyHolder,
 						subclassAndSingleTableStrategy ? Nullability.FORCED_NULL : Nullability.NO_CONSTRAINT,
 						propertyAnnotatedElement.element,
-						propertyAnnotatedElement.inferredData, classGenerators, classGeneratorTables, entityBinder,
+						propertyAnnotatedElement.inferredData, classGenerators, entityBinder,
 						false, mappings
 				);
 			}
@@ -760,15 +750,6 @@
 		mappings.addTypeDef( defAnn.name(), defAnn.typeClass().getName(), params );
 	}
 
-	private static HashMap<String, Properties> buildLocalGeneratorTable(AnnotatedElement annotatedClass) {
-		HashMap<String, Properties> result = new HashMap<String, Properties>();
-		GeneratedIdTable ann = (GeneratedIdTable) annotatedClass.getAnnotation( GeneratedIdTable.class );
-		if ( ann != null ) {
-			result.put( ann.name(), buildPropertiesFromGeneratorTable( ann ) );
-		}
-		return result;
-	}
-
 	private static void bindDiscriminatorToPersistentClass(
 			RootClass rootClass,
 			Ejb3DiscriminatorColumn discriminatorColumn, Map<String, Join> secondaryTables,
@@ -852,7 +833,7 @@
 	private static void processElementAnnotations(
 			PropertyHolder propertyHolder, Nullability nullability, AnnotatedElement annotatedElt,
 			PropertyInferredData inferredData, HashMap<String, IdGenerator> classGenerators,
-			HashMap<String, Properties> classGeneratorTables, EntityBinder entityBinder, boolean isIdentifierMapper,
+			EntityBinder entityBinder, boolean isIdentifierMapper,
 			ExtendedMappings mappings
 	)
 			throws MappingException {
@@ -982,9 +963,7 @@
 
 			//clone classGenerator and override with local values
 			HashMap<String, IdGenerator> localGenerators = (HashMap<String, IdGenerator>) classGenerators.clone();
-			HashMap<String, Properties> localGeneratorTables = (HashMap<String, Properties>) classGeneratorTables.clone();
 			localGenerators.putAll( buildLocalGenerators( annotatedElt, mappings ) );
-			localGeneratorTables.putAll( buildLocalGeneratorTable( annotatedElt ) );
 
 			//manage composite related metadata
 			Embeddable embeddableAnn = (Embeddable) returnedClass.getAnnotation( Embeddable.class );
@@ -1006,7 +985,6 @@
 					columns,
 					propertyHolder,
 					localGenerators,
-					localGeneratorTables,
 					isComponent,
 					columnOverride,
 					propertyAccess,
@@ -1463,8 +1441,7 @@
 			processElementAnnotations(
 					subHolder, isNullable ? Nullability.NO_CONSTRAINT : Nullability.FORCED_NOT_NULL,
 					propertyAnnotatedElement.element, propertyAnnotatedElement.inferredData,
-					new HashMap<String, IdGenerator>(),
-					new HashMap<String, Properties>(), entityBinder, isIdentifierMapper, mappings
+					new HashMap<String, IdGenerator>(), entityBinder, isIdentifierMapper, mappings
 			);
 		}
 		return comp;
@@ -1473,7 +1450,7 @@
 	private static void bindId(
 			String generatorType, String generatorName,
 			PropertyInferredData inferredData, Ejb3Column[] columns, PropertyHolder propertyHolder,
-			Map<String, IdGenerator> localGenerators, HashMap<String, Properties> localGeneratorTables,
+			Map<String, IdGenerator> localGenerators,
 			boolean isComposite, Map<String, Column[]> columnOverride, boolean isPropertyAccess,
 			EntityBinder entityBinder, Type typeAnn, boolean isEmbedded, ExtendedMappings mappings
 	) {
@@ -1545,10 +1522,6 @@
 				Map.Entry elt = (Map.Entry) genParams.next();
 				params.setProperty( (String) elt.getKey(), (String) elt.getValue() );
 			}
-			if ( MultipleHiLoPerTableGenerator.class.getName().equals( generatorType ) ) {
-				//try and find the associated Generator Table
-				fillGeneratorWithGeneratorTableParams( params, localGeneratorTables, generatorName, mappings );
-			}
 		}
 		if ( generatorType == "assigned" ) id.setNullValue( "undefined" );
 		id.setIdentifierGeneratorProperties( params );
@@ -1565,54 +1538,6 @@
 		}
 	}
 
-	/**
-	 * @param gen
-	 * @param generatorType
-	 * @param generatorName
-	 */
-	private static void checkIfMatchingGenerator(IdGenerator gen, String generatorType, String generatorName) {
-		//this means: the generators are of the same type or
-		//Id annotation's generatorType == AUTO
-		//the default generator can be either Sequence, Table or Id, so we should let it go wo restriction
-		boolean matchingGenerator = gen.getIdentifierGeneratorStrategy().equals( generatorType );
-		boolean defaultGenerator = generatorType( GeneratorType.AUTO ).equals( generatorType );
-
-		if ( ! ( matchingGenerator || defaultGenerator ) ) {
-			//named generator and id one should be compatible
-			throw new AnnotationException(
-					"Incompatible generator between Id.generate and its named generator: "
-							+ generatorType + "!=" + generatorName
-			);
-		}
-	}
-
-	private static void fillGeneratorWithGeneratorTableParams(
-			Properties params, HashMap<String, Properties> localGeneratorTables, String generatorName,
-			ExtendedMappings mappings
-	) {
-		final String generatorTableName = params.getProperty( GENERATOR_TABLE_NAME_PARAM );
-		Properties props = mappings.getGeneratorTableProperties( generatorTableName, localGeneratorTables );
-		if ( props == null ) {
-			if ( MultipleHiLoPerTableGenerator.DEFAULT_TABLE.equals( generatorTableName ) ) {
-				//default value
-				return;
-			}
-			else {
-				throw new AnnotationException(
-						"Unable to find a @GeneratedIdTable for table name in " + generatorName + ": " + generatorTableName
-				);
-			}
-		}
-		else {
-			Iterator properties = props.entrySet().iterator();
-			java.util.Map.Entry<String, String> property;
-			while ( properties.hasNext() ) {
-				property = (java.util.Map.Entry<String, String>) properties.next();
-				params.setProperty( property.getKey(), property.getValue() );
-			}
-		}
-	}
-
 	private static void bindManyToOne(
 			String cascadeStrategy, Ejb3JoinColumn[] columns, boolean optional, FetchMode fetchMode,
 			boolean ignoreNotFound, String propertyName,

Update of /cvsroot/hibernate/HibernateExt/metadata/src/test/org/hibernate/test/annotations/duplicatedgenerator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2548/metadata/src/test/org/hibernate/test/annotations/duplicatedgenerator

Modified Files:
	package-info.java 
Log Message:
ANN-190

Index: package-info.java
===================================================================
RCS file: /cvsroot/hibernate/HibernateExt/metadata/src/test/org/hibernate/test/annotations/duplicatedgenerator/package-info.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- package-info.java	12 May 2005 13:33:27 -0000	1.1
+++ package-info.java	29 Dec 2005 13:40:38 -0000	1.2
@@ -4,8 +4,12 @@
  */
 @javax.persistence.TableGenerator(
 	name="EMP_GEN",
-	tableName="ID_GEN_TABLE",
+	table = @Table(name="GENERATOR_TABLE"),
+	pkColumnName = "key",
+	valueColumnName = "hi",
 	pkColumnValue="EMP",
 	allocationSize=20
 )
 package org.hibernate.test.annotations.duplicatedgenerator;
+
+import javax.persistence.Table;

Update of /cvsroot/hibernate/HibernateExt/org.hibernate.eclipse.mapper/dtds
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20828/dtds

Modified Files:
	hibernate-reverse-engineering-3.0.dtd 
	hibernate-mapping-3.0.dtd 
Log Message:
updated dtds

Index: hibernate-reverse-engineering-3.0.dtd
===================================================================
RCS file: /cvsroot/hibernate/HibernateExt/org.hibernate.eclipse.mapper/dtds/hibernate-reverse-engineering-3.0.dtd,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- hibernate-reverse-engineering-3.0.dtd	14 Oct 2005 13:51:29 -0000	1.7
+++ hibernate-reverse-engineering-3.0.dtd	29 Dec 2005 12:29:45 -0000	1.8
@@ -31,9 +31,14 @@
 <!ATTLIST sql-type hibernate-type CDATA #REQUIRED >
 
 <!ELEMENT table (primary-key?, column*, foreign-key*) >
+<!-- Catalog for the table -->
 <!ATTLIST table catalog CDATA #IMPLIED >
+<!-- Schema for the table -->
 <!ATTLIST table schema  CDATA #IMPLIED >
+<!-- Name of the table -->
 <!ATTLIST table name    CDATA #REQUIRED >
+<!-- The class name to use for the table -->
+<!ATTLIST table class   CDATA #IMPLIED >
 
 <!ELEMENT column EMPTY >
 <!ATTLIST column name           CDATA        #REQUIRED >

Index: hibernate-mapping-3.0.dtd
===================================================================
RCS file: /cvsroot/hibernate/HibernateExt/org.hibernate.eclipse.mapper/dtds/hibernate-mapping-3.0.dtd,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- hibernate-mapping-3.0.dtd	7 Oct 2005 10:26:26 -0000	1.3
+++ hibernate-mapping-3.0.dtd	29 Dec 2005 12:29:45 -0000	1.4
@@ -91,7 +91,7 @@
 	<!ATTLIST class subselect CDATA #IMPLIED>
 	<!ATTLIST class discriminator-value CDATA #IMPLIED>				<!-- default: unqualified class name | none -->
 	<!ATTLIST class mutable (true|false) "true">
-	<!ATTLIST class abstract (true|false) "false">
+	<!ATTLIST class abstract (true|false) #IMPLIED>
 	<!ATTLIST class polymorphism (implicit|explicit) "implicit">
 	<!ATTLIST class where CDATA #IMPLIED>							<!-- default: none -->
 	<!ATTLIST class persister CDATA #IMPLIED>
@@ -243,7 +243,7 @@
 	<!ATTLIST subclass select-before-update (true|false) "false">
 	<!ATTLIST subclass extends CDATA #IMPLIED>							<!-- default: empty when a toplevel, otherwise the nearest class definition -->
 	<!ATTLIST subclass lazy (true|false) #IMPLIED>
-	<!ATTLIST subclass abstract (true|false) "false">
+	<!ATTLIST subclass abstract (true|false) #IMPLIED>
 	<!ATTLIST subclass persister CDATA #IMPLIED>
 	<!ATTLIST subclass batch-size CDATA #IMPLIED>
 	<!ATTLIST subclass node CDATA #IMPLIED>
@@ -278,7 +278,7 @@
 	<!ATTLIST joined-subclass select-before-update (true|false) "false">
 	<!ATTLIST joined-subclass extends CDATA #IMPLIED>			 		<!-- default: none when toplevel, otherwise the nearest class definition -->
 	<!ATTLIST joined-subclass lazy (true|false) #IMPLIED>
-	<!ATTLIST joined-subclass abstract (true|false) "false">
+	<!ATTLIST joined-subclass abstract (true|false) #IMPLIED>
 	<!ATTLIST joined-subclass persister CDATA #IMPLIED>
 	<!ATTLIST joined-subclass check CDATA #IMPLIED>				 		<!-- default: none -->
 	<!ATTLIST joined-subclass batch-size CDATA #IMPLIED>
@@ -313,7 +313,7 @@
 	<!ATTLIST union-subclass select-before-update (true|false) "false">
 	<!ATTLIST union-subclass extends CDATA #IMPLIED>					<!-- default: none when toplevel, otherwise the nearest class definition -->
 	<!ATTLIST union-subclass lazy (true|false) #IMPLIED>
-	<!ATTLIST union-subclass abstract (true|false) "false">
+	<!ATTLIST union-subclass abstract (true|false) #IMPLIED>
 	<!ATTLIST union-subclass persister CDATA #IMPLIED>
 	<!ATTLIST union-subclass check CDATA #IMPLIED>						<!-- default: none -->
 	<!ATTLIST union-subclass batch-size CDATA #IMPLIED>
@@ -1004,15 +1004,15 @@
     Element for defining "auxiliary" database objects.  Must be one of two forms:
 
     #1 :
-        <auxiliary-object>
+        <database-object>
             <definition class="CustomClassExtendingAuxiliaryObject"/>
-        </auxiliary-object>
+        </database-object>
 
     #2 :
-        <auxiliary-object>
-            <create>CRAETE OR REPLACE ....</create>
+        <database-object>
+            <create>CREATE OR REPLACE ....</create>
             <drop>DROP ....</drop>
-        </auxiliary-object>
+        </database-object>
 -->
 <!ELEMENT database-object ( (definition|(create,drop)), dialect-scope* )>

Update of /cvsroot/hibernate/HibernateExt/metadata/src/test/org/hibernate/validator/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12578/metadata/src/test/org/hibernate/validator/test

Added Files:
	EmailTest.java User.java 
Log Message:
ANN-188 through a simple regexp expression

--- NEW FILE: EmailTest.java ---
//$Id: EmailTest.java,v 1.1 2005/12/29 11:44:20 epbernard Exp $
package org.hibernate.validator.test;

import junit.framework.TestCase;
import org.hibernate.validator.ClassValidator;

/**
 * @author Emmanuel Bernard
 */
public class EmailTest extends TestCase {
	private ClassValidator<User> userValidator;
	public void testEmail() throws Exception {
		userValidator = new ClassValidator<User>(User.class);
		isRightEmail( "emmanuel@..." );
		isWrongEmail( "emmanuel.hibernate.org" );
		isRightEmail( "emmanuel@..." );
		isRightEmail( "emma-n_uel@..." );
		isWrongEmail( "emma nuel@..." );
		isWrongEmail( "emmanuel@" );
	}

	private void isRightEmail(String email) {
		assertEquals( "Wrong email", 0, userValidator.getPotentialInvalidValues( "email", email).length );
	}

	private void isWrongEmail(String email) {
		assertEquals( "Right email", 1, userValidator.getPotentialInvalidValues( "email", email).length );;
	}
}

--- NEW FILE: User.java ---
//$Id: User.java,v 1.1 2005/12/29 11:44:20 epbernard Exp $
package org.hibernate.validator.test;

import org.hibernate.validator.NotNull;
import org.hibernate.validator.Email;

/**
 * @author Emmanuel Bernard
 */
public class User {
	@NotNull
	public String name;
	@Email
	public String email;
}

Update of /cvsroot/hibernate/HibernateExt/ejb/src/java/org/hibernate/ejb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16418/ejb/src/java/org/hibernate/ejb

Modified Files:
	Ejb3Configuration.java 
Log Message:
the root jar is no longer in jar-file list

Index: Ejb3Configuration.java
===================================================================
RCS file: /cvsroot/hibernate/HibernateExt/ejb/src/java/org/hibernate/ejb/Ejb3Configuration.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- Ejb3Configuration.java	29 Dec 2005 02:41:45 -0000	1.19
+++ Ejb3Configuration.java	29 Dec 2005 04:15:31 -0000	1.20
@@ -202,7 +202,13 @@
 			if ( detectArtifact[0] ) scanForClasses( jar, packages, entities );
 			if ( detectArtifact[1] ) scanForHbmXmlFiles( jar, hbmFiles );
 		}
-		Properties props = info.getProperties();
+      if (!info.excludeUnlistedClasses())
+      {
+         if (detectArtifact[0]) scanForClasses(info.getPersistenceUnitRootUrl(), packages, entities);
+         if (detectArtifact[1]) scanForHbmXmlFiles(info.getPersistenceUnitRootUrl(), hbmFiles);
+      }
+
+      Properties props = info.getProperties();
 		if ( props == null ) props = new Properties();
 		workingVars.put( HibernatePersistence.CLASS_NAMES, entities );
 		workingVars.put( HibernatePersistence.PACKAGE_NAMES, packages );

Update of /cvsroot/hibernate/HibernateExt/ejb-api/src/javax/persistence/spi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1350/ejb-api/src/javax/persistence/spi

Modified Files:
	PersistenceProvider.java 
Added Files:
	ClassTransformer.java PersistenceUnitInfo.java 
	PersistenceUnitTransactionType.java 
Removed Files:
	PersistenceInfo.java 
Log Message:
changes for PersistenceUnitInfo

--- NEW FILE: ClassTransformer.java ---
/*
* JBoss, Home of Professional Open Source
* Copyright 2005, JBoss Inc., and individual contributors as indicated
* by the @authors tag. See the copyright.txt in the distribution for a
* full listing of individual contributors.
*
* This is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
*
* This software is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this software; if not, write to the Free
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
package javax.persistence.spi;

import java.security.ProtectionDomain;
import java.lang.instrument.IllegalClassFormatException;

/**
 * A persistence provider provides an instance of this interface
 * to the PersistenceUnitInfo.addTransformer method.
 * The supplied transformer instance will get called to transform
 * entity class files when they are loaded and redefined.  The transformation
 * occurs before the class is defined by the JVM
 *
 *
 * @author <a href="mailto:bill@... Burke</a>
 * @version $Revision: 1.1 $
 */
public interface ClassTransformer
{
   /**
    * Invoked when a class is being loaded or redefined to add hooks for persistence bytecode manipulation
    *
    * @param loader the defining class loaderof the class being transformed.  It may be null if using bootstrap loader
    * @param classname The name of the class being transformed
    * @param classBeingRedefined If an already loaded class is being redefined, then pass this as a parameter
    * @param protectionDomain ProtectionDomain of the class being (re)-defined
    * @param classfileBuffer The input byte buffer in class file format
    * @return A well-formed class file that can be loaded
    *
    * @throws IllegalClassFormatException
    */
   byte[] transform(ClassLoader loader,
                    String classname,
                    Class<?> classBeingRedefined,
                    ProtectionDomain protectionDomain,
                    byte[] classfileBuffer)
   throws IllegalClassFormatException;
}

--- NEW FILE: PersistenceUnitInfo.java ---
/*
 * JBoss, the OpenSource J2EE webOS
 *
 * Distributable under LGPL license.
 * See terms of license at gnu.org.
 */
package javax.persistence.spi;

import java.net.URL;
import java.util.List;
import java.util.Properties;
import javax.sql.DataSource;

/**
 * Interface implemented and used by the Container to pass
 * persistence metadata to the persistence provider as part of
 * the createContainerEntityManagerFactory() call. The provider
 * will use this metadata to obtain the mappings and initialize
 * its structures.
 */
public interface PersistenceUnitInfo
{

   /**
    * Returns the name of the EntityManager that is being created.
    * Corresponds to the <name> element in persistence.xml
    */
   public String getPersistenceUnitName();

   /**
    * Returns the name of the persistence provider implementation class.
    * Corresponds to the <provider> element in persistence.xml
    */
   public String getPersistenceProviderClassName();

   /**
    *
    * @return whether the persistence unit will be JTA or managed by an EntityTransaction
    */
   public PersistenceUnitTransactionType getTransactionType();

   /**
    * Returns the JTA-enabled data source to be used by the persistence provider.
    * The data source corresponds to the named <jta-data-source> element in persistence.xml
    */
   public DataSource getJtaDataSource();

   /**
    * Returns the non-JTA-enabled data source to be used by the persistence provider
    * when outside the container, or inside the container when accessing data outside
    * the global transaction.
    * The data source corresponds to the named <non-jta-data-source> element in persistence.xml
    */
   public DataSource getNonJtaDataSource();

   /**
    * Returns the list of mapping file names that the persistence provider must
    * load to determine the mappings for the entity classes. The mapping files
    * must be in standard EJB mapping XML format, be uniquely named and be
    * resource-loadable from the application classpath. This list will not include
    * the entity-mappings.xml file if one was specified.
    * Each mapping file name corresponds to a <mapping-file> element in persistence.xml
    */
   public List<String> getMappingFileNames();

   /**
    * Returns the list of JAR file URLs that the persistence provider
    * must look in to find the entity classes that must be managed by
    * EntityManagers of this name. The persistence archive jar itself
    * will always be the last entry in the list.
    * Each jar file URL corresponds to a named <jar-file> element in persistence.xml
    */
   public List<URL> getJarFiles();

   /**
    * @return the URL or directory that is the root of the persistence unit.
    */
   public URL getPersistenceUnitRootUrl();

   /**
    * Returns the list of class names that the persistence provider
    * must inspect to see if it should add it to its set of managed
    * entity classes that must be managed by EntityManagers of this name.
    * Each class name corresponds to a named <class> element in persistence.xml
    */
   public List<String> getManagedClassNames();

   /**
    *
    * @return  Whether classes in the root of the persistence unit that have not been
    * explicitly listed are to be included in the set of maanged classes.
    * This value corresponds to the <exlude-unlisted-classes> element in the persistence.xml file
    */
   public boolean excludeUnlistedClasses();

   /**
    * Returns a Properties object that may contain vendor-specific properties
    * contained in the persistence.xml file.
    * Each property corresponds to a <property> element in persistence.xml
    */
   public Properties getProperties();

   /**
    * Returns a ClassLoader that the provider may use to load any
    * classes, resources, or open URLs.
    */
   public ClassLoader getClassLoader();


   /**
    * Add a transformer supplied by the provider that will be called for every
    * new class definition that gets loaded by the PersistenceUnitInfo.getClassLoader
    * method.  The transformer has no effect on classes loaded with the temp class loader.
    *
    *
    * @param transformer that is used to add persistence bytecode manipulation
    */
   public void addTransformer(ClassTransformer transformer);

   /**
    *
    * @return temporary classloader that can be used to load any classes, resources or URLs
    * needed to process the deployment
    */
   public ClassLoader getNewTempClassLoader();

}
--- NEW FILE: PersistenceUnitTransactionType.java ---
/*
* JBoss, Home of Professional Open Source
* Copyright 2005, JBoss Inc., and individual contributors as indicated
* by the @authors tag. See the copyright.txt in the distribution for a
* full listing of individual contributors.
*
* This is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
*
* This software is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this software; if not, write to the Free
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
package javax.persistence.spi;

/**
 * Defines whether a persistence unit will be JTA managed or manged locally with EntityTransactions
 *
 * @author <a href="mailto:bill@... Burke</a>
 * @version $Revision: 1.1 $
 */
public enum PersistenceUnitTransactionType
{
   JTA,
   RESOURCE_LOCAL
}

Index: PersistenceProvider.java
===================================================================
RCS file: /cvsroot/hibernate/HibernateExt/ejb-api/src/javax/persistence/spi/PersistenceProvider.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- PersistenceProvider.java	18 Jun 2005 23:14:40 -0000	1.2
+++ PersistenceProvider.java	29 Dec 2005 02:43:37 -0000	1.3
@@ -33,6 +33,6 @@
     * @param info The necessary metadata for the provider to use
     * @return EntityManagerFactory for the named EntityManager
     */
-   public EntityManagerFactory createContainerEntityManagerFactory(PersistenceInfo info);
+   public EntityManagerFactory createContainerEntityManagerFactory(PersistenceUnitInfo info);
   }
 

--- PersistenceInfo.java DELETED ---

Update of /cvsroot/hibernate/HibernateExt/ejb/src/test-resources/explicitpar/META-INF
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv964/ejb/src/test-resources/explicitpar/META-INF

Modified Files:
	persistence.xml 
Log Message:
change to new persistence.xml format

Index: persistence.xml
===================================================================
RCS file: /cvsroot/hibernate/HibernateExt/ejb/src/test-resources/explicitpar/META-INF/persistence.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- persistence.xml	27 Nov 2005 11:19:09 -0000	1.4
+++ persistence.xml	29 Dec 2005 02:41:46 -0000	1.5
@@ -1,36 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<entity-manager>
-   <name>manager1</name>
-   <class>org.hibernate.ejb.test.Cat</class>
-   <class>org.hibernate.ejb.test.Distributor</class>
-   <class>org.hibernate.ejb.test.Item</class>
-   <class>org.hibernate.ejb.test</class>
-   <jar-file>./build/testresources/externaljar.jar</jar-file>
-   <properties>
-       <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/>
-       <property name="hibernate.connection.driver_class" value="org.hsqldb.jdbcDriver"/>
-       <property name="hibernate.connection.username" value="sa"/>
-       <property name="hibernate.connection.password" value=""/>
-       <property name="hibernate.connection.url" value="jdbc:hsqldb:."/>
-       <property name="hibernate.cache.use_query_cache" value="true"/>
-       <property name="hibernate.cache.region_prefix" value="hibernate.test"/>
-       <property name="hibernate.jdbc.use_streams_for_binary" value="true"/>
-       <property name="hibernate.jdbc.batch_size" value="0"/>
-       <property name="hibernate.max_fetch_depth" value="3"/>
-       <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-       <property name="hibernate.generate_statistics" value="true"/>
-       <property name="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider"/>
-       <property name="hibernate.ejb.naming_strategy">org.hibernate.ejb.test.MyNamingStrategy</property>
-       <!-- test naming strategy and fall back to element content -->
+<persistence>
+   <persistence-unit>
+      <name>manager1</name>
+      <class>org.hibernate.ejb.test.Cat</class>
+      <class>org.hibernate.ejb.test.Distributor</class>
+      <class>org.hibernate.ejb.test.Item</class>
+      <class>org.hibernate.ejb.test</class>
+      <jar-file>./build/testresources/externaljar.jar</jar-file>
+      <properties>
+          <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/>
+          <property name="hibernate.connection.driver_class" value="org.hsqldb.jdbcDriver"/>
+          <property name="hibernate.connection.username" value="sa"/>
+          <property name="hibernate.connection.password" value=""/>
+          <property name="hibernate.connection.url" value="jdbc:hsqldb:."/>
+          <property name="hibernate.cache.use_query_cache" value="true"/>
+          <property name="hibernate.cache.region_prefix" value="hibernate.test"/>
+          <property name="hibernate.jdbc.use_streams_for_binary" value="true"/>
+          <property name="hibernate.jdbc.batch_size" value="0"/>
+          <property name="hibernate.max_fetch_depth" value="3"/>
+          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+          <property name="hibernate.generate_statistics" value="true"/>
+          <property name="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider"/>
+          <property name="hibernate.ejb.naming_strategy">org.hibernate.ejb.test.MyNamingStrategy</property>
+          <!-- test naming strategy and fall back to element content -->
 
-       <!-- cache configuration -->
-       <property name="hibernate.ejb.classcache.org.hibernate.ejb.test.Item" value="read-write"/>
-       <property name="hibernate.ejb.collectioncache.org.hibernate.ejb.test.Item.distributors" value="read-write, RegionName"/>
+          <!-- cache configuration -->
+          <property name="hibernate.ejb.classcache.org.hibernate.ejb.test.Item" value="read-write"/>
+          <property name="hibernate.ejb.collectioncache.org.hibernate.ejb.test.Item.distributors" value="read-write, RegionName"/>
 
-       <!-- event overriding -->
-       <property name="hibernate.ejb.event.pre-insert" value=""/> <!-- remove JACC and validator -->
+          <!-- event overriding -->
+          <property name="hibernate.ejb.event.pre-insert" value=""/> <!-- remove JACC and validator -->
 
-       <!-- alternatively to <class> and <property> declarations, you can use a regular hibernate.cfg.xml file -->
-       <!-- property name="hibernate.ejb.cfgfile" value="/org/hibernate/ejb/test/hibernate.cfg.xml"/ -->
-   </properties>
-</entity-manager>
\ No newline at end of file
+          <!-- alternatively to <class> and <property> declarations, you can use a regular hibernate.cfg.xml file -->
+          <!-- property name="hibernate.ejb.cfgfile" value="/org/hibernate/ejb/test/hibernate.cfg.xml"/ -->
+      </properties>
+   </persistence-unit>
+</persistence>

Update of /cvsroot/hibernate/HibernateExt/ejb/src/test-resources/excludehbmpar/META-INF
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv964/ejb/src/test-resources/excludehbmpar/META-INF

Modified Files:
	persistence.xml 
Log Message:
change to new persistence.xml format

Index: persistence.xml
===================================================================
RCS file: /cvsroot/hibernate/HibernateExt/ejb/src/test-resources/excludehbmpar/META-INF/persistence.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- persistence.xml	12 Aug 2005 18:37:20 -0000	1.2
+++ persistence.xml	29 Dec 2005 02:41:46 -0000	1.3
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- example of a default persistence.xml -->
-<entity-manager>
-   <properties>
-       <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/>
-       <property name="hibernate.connection.driver_class" value="org.hsqldb.jdbcDriver"/>
-       <property name="hibernate.connection.username" value="sa"/>
-       <property name="hibernate.connection.password" value=""/>
-       <property name="hibernate.connection.url" value="jdbc:hsqldb:."/>
-       <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-       <property name="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider"/>
-       <property name="hibernate.archive.autodetection" value="class"/>
-   </properties>
-</entity-manager>
\ No newline at end of file
+<persistence>
+   <persistence-unit>
+      <properties>
+          <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/>
+          <property name="hibernate.connection.driver_class" value="org.hsqldb.jdbcDriver"/>
+          <property name="hibernate.connection.username" value="sa"/>
+          <property name="hibernate.connection.password" value=""/>
+          <property name="hibernate.connection.url" value="jdbc:hsqldb:."/>
+          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+          <property name="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider"/>
+          <property name="hibernate.archive.autodetection" value="class"/>
+      </properties>
+   </persistence-unit>
+</persistence>