svn commit: r745697 - in /ode/branches/APACHE_ODE_1.X: Rakefile dao-hibernate-db/src/main/sql/common.sql dao-jpa-ojpa-derby/src/main/scripts/common.sql

[mr...@apache.org]

Author: mriou
Date: Thu Feb 19 00:24:08 2009
New Revision: 745697

URL: http://svn.apache.org/viewvc?rev=745697&view=rev
Log:
ODE-353 When starts up it complains about missing table ODE_SCHEMA_VERSION in database

Added:
    ode/branches/APACHE_ODE_1.X/dao-hibernate-db/src/main/sql/common.sql
    ode/branches/APACHE_ODE_1.X/dao-jpa-ojpa-derby/src/main/scripts/common.sql
Modified:
    ode/branches/APACHE_ODE_1.X/Rakefile

Modified: ode/branches/APACHE_ODE_1.X/Rakefile
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/Rakefile?rev=745697&r1=745696&r2=745697&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/Rakefile (original)
+++ ode/branches/APACHE_ODE_1.X/Rakefile Thu Feb 19 00:24:08 2009
@@ -382,13 +382,14 @@
 
     runtime_sql = export[ properties_for[:derby], dao_hibernate, _("target/runtime.sql") ]
     store_sql = export[ properties_for[:derby], bpel_store, _("target/store.sql") ]
-    derby_sql = concat(_("target/derby.sql")=>[ predefined_for[:derby], runtime_sql, store_sql ])
+    common_sql = _("src/main/sql/common.sql")
+    derby_sql = concat(_("target/derby.sql")=>[ predefined_for[:derby], common_sql, runtime_sql, store_sql ])
     derby_db = Derby.create(_("target/derby/hibdb")=>derby_sql)
     build derby_db
 
     %w{ mysql firebird hsql postgres sqlserver oracle }.each do |db|
       partial = export[ properties_for[db], dao_hibernate, _("target/partial.#{db}.sql") ]
-      build concat(_("target/#{db}.sql")=>[ predefined_for[db], partial ])
+      build concat(_("target/#{db}.sql")=>[ common_sql, predefined_for[db], partial ])
     end
 
     NativeDB.create_dbs self, _("."), :hib
@@ -410,12 +411,13 @@
     %w{ derby mysql oracle }.each do |db|
       db_xml = _("src/main/descriptors/persistence.#{db}.xml")
       scheduler_sql = _("src/main/scripts/simplesched-#{db}.sql")
+      common_sql = _("src/main/scripts/common.sql")
       partial_sql = file("target/partial.#{db}.sql"=>db_xml) do |task|
         mkpath _("target"), :verbose=>false
         Buildr::OpenJPA.mapping_tool :properties=>db_xml, :action=>"build", :sql=>task.name,
           :classpath=>projects("bpel-store", "dao-jpa", "bpel-api", "bpel-dao", "utils" )
       end
-      sql = concat(_("target/#{db}.sql")=>[_("src/main/scripts/license-header.sql"), partial_sql, scheduler_sql])
+      sql = concat(_("target/#{db}.sql")=>[_("src/main/scripts/license-header.sql"), common_sql, partial_sql, scheduler_sql])
       build sql
     end
     derby_db = Derby.create(_("target/derby/jpadb")=>_("target/derby.sql"))

Added: ode/branches/APACHE_ODE_1.X/dao-hibernate-db/src/main/sql/common.sql
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/dao-hibernate-db/src/main/sql/common.sql?rev=745697&view=auto
==============================================================================
--- ode/branches/APACHE_ODE_1.X/dao-hibernate-db/src/main/sql/common.sql (added)
+++ ode/branches/APACHE_ODE_1.X/dao-hibernate-db/src/main/sql/common.sql Thu Feb 19 00:24:08 2009
@@ -0,0 +1,2 @@
+create table ODE_SCHEMA_VERSION(VERSION integer);
+insert into ODE_SCHEMA_VERSION values (5);

Added: ode/branches/APACHE_ODE_1.X/dao-jpa-ojpa-derby/src/main/scripts/common.sql
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/dao-jpa-ojpa-derby/src/main/scripts/common.sql?rev=745697&view=auto
==============================================================================
--- ode/branches/APACHE_ODE_1.X/dao-jpa-ojpa-derby/src/main/scripts/common.sql (added)
+++ ode/branches/APACHE_ODE_1.X/dao-jpa-ojpa-derby/src/main/scripts/common.sql Thu Feb 19 00:24:08 2009
@@ -0,0 +1,2 @@
+create table ODE_SCHEMA_VERSION(VERSION integer);
+insert into ODE_SCHEMA_VERSION values (5);