ODE-1038: Created a index.sql script to be included during the build.
diff --git a/Rakefile b/Rakefile
index 21be262..630cedc 100644
--- a/Rakefile
+++ b/Rakefile
@@ -351,11 +351,12 @@
     end
 
     common_sql = _("src/main/sql/common.sql")
-    
+    index_sql = _("src/main/sql/index.sql")
+
     %w{ derby mysql firebird hsql postgres sqlserver oracle h2}.each do |db|
       partial_runtime = export[ properties_for[db], dao_hibernate, _("target/partial.runtime.#{db}.sql") ]
       partial_store = export[ properties_for[db], bpel_store, _("target/partial.store.#{db}.sql") ]
-      build concat(_("target/#{db}.sql")=>[ common_sql, predefined_for[db], partial_store, partial_runtime])
+      build concat(_("target/#{db}.sql")=>[ common_sql, predefined_for[db], partial_store, partial_runtime, index_sql])
     end
 
     derby_sql = _("target/derby.sql")
diff --git a/dao-hibernate-db/src/main/sql/index.sql b/dao-hibernate-db/src/main/sql/index.sql
new file mode 100644
index 0000000..c99df88
--- /dev/null
+++ b/dao-hibernate-db/src/main/sql/index.sql
@@ -0,0 +1,34 @@
+
+CREATE INDEX IDX_CORRELATOR_CID on BPEL_CORRELATOR (CID);
+CREATE INDEX IDX_BPEL_CORRELATOR_PROCESS_ID on BPEL_CORRELATOR(PROCESS_ID);
+CREATE INDEX IDX_BPEL_CORRELATOR_MSG_CKEY on BPEL_CORRELATOR_MESSAGE_CKEY (CKEY);
+CREATE INDEX IDX_SELECTOR_SELGRPID on BPEL_SELECTORS (SELGRPID);
+CREATE INDEX IDX_SELECTOR_CKEY on BPEL_SELECTORS (CORRELATION_KEY);
+CREATE INDEX IDX_SELECTOR_CORRELATOR on BPEL_SELECTORS (CORRELATOR);
+CREATE INDEX IDX_SELECTOR_INSTANCE on BPEL_SELECTORS (PIID);
+CREATE INDEX IDX_BPEL_SELECTORS_PROC_TYPE on BPEL_SELECTORS(PROC_TYPE);
+CREATE INDEX IDX_UNMATCHED_CORRELATOR on BPEL_UNMATCHED (CORRELATOR);
+CREATE INDEX IDX_UNMATCHED_CKEY on BPEL_UNMATCHED (CORRELATION_KEY);
+CREATE INDEX IDX_UNMATCHED_CORRELATOR_CKEY on BPEL_UNMATCHED (CORRELATOR,CORRELATION_KEY);
+CREATE INDEX IDX_UNMATCHED_MEX on BPEL_UNMATCHED (MEX);
+CREATE INDEX IDX_XMLDATA_IID on BPEL_XML_DATA (PIID);
+CREATE INDEX IDX_XMLDATA_SID on BPEL_XML_DATA (SCOPE_ID);
+CREATE INDEX IDX_XMLDATA_NAME on BPEL_XML_DATA (NAME);
+CREATE INDEX IDX_XMLDATA_NAME_SID on BPEL_XML_DATA (NAME, SCOPE_ID);
+CREATE INDEX IDX_EVENT_IID on BPEL_EVENT (IID);
+CREATE INDEX IDX_EVENT_PID on BPEL_EVENT (PID);
+CREATE INDEX IDX_CORR_SET_NAME on BPEL_CORRELATION_SET (CORR_SET_NAME);
+CREATE INDEX IDX_CORR_SET_SCOPE_ID on BPEL_CORRELATION_SET (SCOPE_ID);
+CREATE INDEX IDX_BPEL_INSTANCE_PROCESS_ID on BPEL_INSTANCE (PROCESS_ID);
+CREATE INDEX IDX_BPEL_INSTANCE_STATE on BPEL_INSTANCE (STATE);
+CREATE INDEX IDX_BPEL_PROCESS_TYPE_NAME on BPEL_PROCESS (type_name);
+CREATE INDEX IDX_BPEL_PROCESS_TYPE_NS on BPEL_PROCESS (type_ns);
+CREATE INDEX IDX_PLINK_VAL_PROCESS_IDX on BPEL_PLINK_VAL (PROCESS);
+CREATE INDEX IDX_PLINK_VAL_SCOPE on BPEL_PLINK_VAL (SCOPE);
+CREATE INDEX IDX_PLINK_VAL_MODELID on BPEL_PLINK_VAL (MODELID);
+CREATE INDEX IDX_VARPROP_XMLDATA on VAR_PROPERTY (XML_DATA_ID);
+CREATE INDEX IDX_VARPROP_NAME on VAR_PROPERTY (PROP_NAME);
+CREATE INDEX IDX_VARPROP_VALUE on VAR_PROPERTY (PROP_VALUE);
+CREATE INDEX IDX_MESSAGE_MEX on BPEL_MESSAGE(MEX);
+CREATE INDEX IDX_MESSAGE_EXCHANGE_PIID on BPEL_MESSAGE_EXCHANGE(PIID);
+CREATE INDEX IDX_SCOPE_PIID on BPEL_SCOPE(PIID);
diff --git a/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HCorrelator.java b/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HCorrelator.java
index a74a413..cc25337 100644
--- a/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HCorrelator.java
+++ b/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HCorrelator.java
@@ -70,7 +70,7 @@
 
     /**
      * @hibernate.property
-     * @hibernate.column name="CID" index="IDX_CORRELATOR_CID"
+     * @hibernate.column name="CID" 
      */
     public String getCorrelatorId() {
         return _correlatorId;
diff --git a/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HCorrelatorMessage.java b/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HCorrelatorMessage.java
index 3b904a5..1696e46 100644
--- a/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HCorrelatorMessage.java
+++ b/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HCorrelatorMessage.java
@@ -54,7 +54,6 @@
     /**
      * @hibernate.property column="CORRELATION_KEY"
      * @hibernate.column name="CORRELATION_KEY"
-     *                   index="IDX_UNMATCHED_CKEY"
      *
      */
     public String getCorrelationKey() {
@@ -67,7 +66,7 @@
 
     /**
      * @hibernate.many-to-one foreign-key="none"
-     * @hibernate.column name="CORRELATOR" index="IDX_UNMATCHED_CORRELATOR" not-null="true"
+     * @hibernate.column name="CORRELATOR" not-null="true"
      */
     public HCorrelator getCorrelator() {
         return _correlator;
diff --git a/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HCorrelatorMessageKey.java b/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HCorrelatorMessageKey.java
index d64693d..910e4af 100644
--- a/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HCorrelatorMessageKey.java
+++ b/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HCorrelatorMessageKey.java
@@ -45,7 +45,6 @@
    *   not-null="true"
    * @hibernate.column
    *   name="CKEY"
-   *   index="IDX_BPEL_CORRELATOR_MESSAGE_CKEY"
    */
   public String getCanonical() {
     return _keyCanonical;
diff --git a/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HCorrelatorSelector.java b/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HCorrelatorSelector.java
index d71ff55..d12f3d6 100644
--- a/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HCorrelatorSelector.java
+++ b/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HCorrelatorSelector.java
@@ -52,7 +52,7 @@
 
     /**
      * @hibernate.property column="SELGRPID"
-     * @hibernate.column name="SELGRPID" index="IDX_SELECTOR_SELGRPID" not-null="true"
+     * @hibernate.column name="SELGRPID" not-null="true"
      */
     public String getGroupId() {
         return _groupId;
@@ -83,7 +83,6 @@
     /**
      * @hibernate.property column="CORRELATION_KEY" not-null="true"
      * @hibernate.column name="CORRELATION_KEY"
-     *                   index="IDX_SELECTOR_CKEY"
      *                   not-null="true"
      *                   unique-key="UNIQ_SELECTOR"
      *
@@ -120,8 +119,7 @@
 
     /**
      * @hibernate.many-to-one not-null="true" foreign-key="none"
-     * @hibernate.column name="CORRELATOR" not-null="true"
-     *          index="IDX_SELECTOR_CORRELATOR" unique-key="UNIQ_SELECTOR"
+     * @hibernate.column name="CORRELATOR" not-null="true" unique-key="UNIQ_SELECTOR"
      */
     public HCorrelator getCorrelator() {
         return _correlator;
diff --git a/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HVariableProperty.java b/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HVariableProperty.java
index ef53974..4aa3425 100644
--- a/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HVariableProperty.java
+++ b/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HVariableProperty.java
@@ -62,7 +62,6 @@
     /**
      * @hibernate.property
      *    column="PROP_VALUE"
-     *    index="PROP_VALUE_IDX"
      */
     public String getValue() {
         return _propertyValue;
@@ -77,7 +76,6 @@
      *    type="string"
      *    length="255"
      *    not-null="true"
-     *    index="PROP_NAME_IDX"
      */
     public String getName() {
         return _propertyName;