svn commit: r909049 - in /ode/branches/APACHE_ODE_1.X: Rakefile dao-hibernate/src/main/java/org/apache/ode/daohib/NativeHiLoGenerator.java dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HObject.java

[rr...@apache.org]

Author: rr
Date: Thu Feb 11 16:09:03 2010
New Revision: 909049

URL: http://svn.apache.org/viewvc?rev=909049&view=rev
Log:
ODE-741: Improved hibernate_sequence queries

Added:
    ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/NativeHiLoGenerator.java   (with props)
Modified:
    ode/branches/APACHE_ODE_1.X/Rakefile
    ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HObject.java

Modified: ode/branches/APACHE_ODE_1.X/Rakefile
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/Rakefile?rev=909049&r1=909048&r2=909049&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/Rakefile (original)
+++ ode/branches/APACHE_ODE_1.X/Rakefile Thu Feb 11 16:09:03 2010
@@ -288,7 +288,7 @@
     bpel_store = project("bpel-store").compile.target
 
     Buildr::Hibernate::REQUIRES[:xdoclet] =  Buildr.group("xdoclet", "xdoclet-xdoclet-module", "xdoclet-hibernate-module",
-      :under=>"xdoclet", :version=>"1.2.3") + ["xdoclet:xjavadoc:jar:1.1-j5"]
+      :under=>"xdoclet", :version=>"1.2.3") + ["xdoclet:xjavadoc:jar:1.1-j5"] + projects("dao-hibernate")
 
     export = lambda do |properties, source, target|
       file(target=>[properties, source]) do |task|

Added: ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/NativeHiLoGenerator.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/NativeHiLoGenerator.java?rev=909049&view=auto
==============================================================================
--- ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/NativeHiLoGenerator.java (added)
+++ ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/NativeHiLoGenerator.java Thu Feb 11 16:09:03 2010
@@ -0,0 +1,94 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.ode.daohib;
+
+import java.io.Serializable;
+import java.util.Properties;
+
+import org.hibernate.HibernateException;
+import org.hibernate.MappingException;
+import org.hibernate.dialect.Dialect;
+import org.hibernate.engine.SessionImplementor;
+import org.hibernate.id.Configurable;
+import org.hibernate.id.IdentifierGenerator;
+import org.hibernate.id.PersistentIdentifierGenerator;
+import org.hibernate.id.SequenceHiLoGenerator;
+import org.hibernate.id.TableHiLoGenerator;
+import org.hibernate.type.Type;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+public class NativeHiLoGenerator implements IdentifierGenerator, PersistentIdentifierGenerator, Configurable {
+    private static final Log __log = LogFactory.getLog(NativeHiLoGenerator.class);
+    private IdentifierGenerator _proxy;
+
+    public NativeHiLoGenerator() {
+        super();
+    }
+
+    public Serializable generate(SessionImplementor session, Object object) throws HibernateException {
+        return _proxy.generate(session, object);
+    }
+
+    public Object generatorKey() {
+        if (_proxy instanceof PersistentIdentifierGenerator)
+            return ((PersistentIdentifierGenerator) _proxy).generatorKey();
+        else
+            return this;
+    }
+
+    public String[] sqlCreateStrings(Dialect dialect) throws HibernateException {
+        if (_proxy instanceof PersistentIdentifierGenerator)
+            return ((PersistentIdentifierGenerator) _proxy).sqlCreateStrings(dialect);
+        else
+            return new String[] {};
+    }
+
+    public String[] sqlDropStrings(Dialect dialect) throws HibernateException {
+        if (_proxy instanceof PersistentIdentifierGenerator)
+            return ((PersistentIdentifierGenerator) _proxy).sqlDropStrings(dialect);
+        else
+            return null;
+    }
+
+    public void configure(Type type, Properties params, Dialect dialect) throws MappingException {
+        Class generatorClass = null;
+        if (dialect.supportsSequences()) {
+            __log.debug("Using SequenceHiLoGenerator");
+            generatorClass = SequenceHiLoGenerator.class;
+        } else {
+            generatorClass = TableHiLoGenerator.class;
+            __log.debug("Using native dialect generator " + generatorClass);
+        }
+
+        IdentifierGenerator g = null;
+        try {
+            g = (IdentifierGenerator) generatorClass.newInstance();
+        } catch (Exception e) {
+            throw new MappingException("", e);
+        }
+
+        if (g instanceof Configurable)
+            ((Configurable) g).configure(type, params, dialect);
+
+        this._proxy = g;
+    }
+}

Propchange: ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/NativeHiLoGenerator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HObject.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HObject.java?rev=909049&r1=909048&r2=909049&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HObject.java (original)
+++ ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HObject.java Thu Feb 11 16:09:03 2010
@@ -54,7 +54,9 @@
     /**
      * Auto-generated primary key.
      * 
-     * @hibernate.id generator-class="native" column="ID"
+     * @hibernate.id generator-class="org.apache.ode.daohib.NativeHiLoGenerator" column="ID"
+     * @hibernate.generator-param name="sequence" value="hibernate_seqhilo"
+     * @hibernate.generator-param name="max_lo" value="99"
      */
     public Long getId() {
         return _id;