svn commit: r594077 - in /ofbiz/trunk/framework/entity: config/entityengine.xml fieldtype/fieldtypefirebird.xml

Author: jleroux
Date: Mon Nov 12 02:34:22 2007
New Revision: 594077

URL: http://svn.apache.org/viewvc?rev=594077&view=rev
Log:
From Derryck Welas's comment in "Firebird 2.0 config improvement" (https://issues.apache.org/jira/browse/OFBIZ-1012) OFBIZ-1012
I kept as comment old jdbc and login/pwd configuration (seems to be not platform independent)

Modified:
    ofbiz/trunk/framework/entity/config/entityengine.xml
    ofbiz/trunk/framework/entity/fieldtype/fieldtypefirebird.xml

Modified: ofbiz/trunk/framework/entity/config/entityengine.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/config/entityengine.xml?rev=594077&r1=594076&r2=594077&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/config/entityengine.xml (original)
+++ ofbiz/trunk/framework/entity/config/entityengine.xml Mon Nov 12 02:34:22 2007
@@ -434,24 +434,29 @@
     <datasource name="localfirebird"
             helper-class="org.ofbiz.entity.datasource.GenericHelperDAO"
             field-type-name="firebird"
-            check-on-start="false"
-            add-missing-on-start="false"
+            check-on-start="true"
+            use-foreign-key-indices="false"
+            add-missing-on-start="true"
+            alias-view-columns="false"
             join-style="ansi">
         <read-data reader-name="seed"/>
         <read-data reader-name="demo"/>
         <read-data reader-name="ext"/>
         <inline-jdbc
                 jdbc-driver="org.firebirdsql.jdbc.FBDriver"
-                jdbc-uri="jdbc:firebirdsql://localhost:3050//opt/interbase/data/ofbiz.gdb"
+                <!-- jdbc-uri="jdbc:firebirdsql://localhost:3050//opt/interbase/data/ofbiz.gdb"
                 jdbc-username="OFBIZ"
-                jdbc-password="ofbiz"
+                jdbc-password="ofbiz" -->
+                jdbc-uri="jdbc:firebirdsql:127.0.0.1:C:\\data\\ofbiz.gdb"
+                jdbc-username="SYSDBA"
+                jdbc-password="masterkey"
                 isolation-level="ReadCommitted"
                 pool-minsize="2"
-                pool-maxsize="250"/>
+                pool-maxsize="250"
+                 />
         <!-- <jndi-jdbc jndi-server-name="default" jndi-name="comp/env/jdbc/xa/localfirebird" isolation-level="ReadCommitted"/> --> <!-- Orion Style JNDI name -->
-        <!-- <tyrex-dataSource dataSource-name="firebird" isolation-level="ReadCommitted"/>  -->
+        <!-- <tyrex-dataSource dataSource-name="firebird" isolation-level="ReadCommitted"/> Â -->
     </datasource>
-
     <!--
      The following has been tested with SQL Server 2005 + MS SQL Server JDBC Driver 1.1
      Tips:

Modified: ofbiz/trunk/framework/entity/fieldtype/fieldtypefirebird.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/fieldtype/fieldtypefirebird.xml?rev=594077&r1=594076&r2=594077&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/fieldtype/fieldtypefirebird.xml (original)
+++ ofbiz/trunk/framework/entity/fieldtype/fieldtypefirebird.xml Mon Nov 12 02:34:22 2007
@@ -23,6 +23,7 @@
   <!-- ===================== field-type-def ==================== -->
    <!-- General Types -->
     <field-type-def type="blob" sql-type="BLOB" java-type="java.sql.Blob"></field-type-def>
+    <field-type-def type="blob" sql-type="BLOB SUB_TYPE 2" java-type="java.lang.Object"></field-type-def>
 
     <field-type-def type="date-time" sql-type="TIMESTAMP" java-type="java.sql.Timestamp"></field-type-def>
     <field-type-def type="date" sql-type="DATE" java-type="java.sql.Date"></field-type-def>
@@ -41,7 +42,7 @@
     <field-type-def type="very-short" sql-type="VARCHAR(10)" java-type="String"></field-type-def>
     <field-type-def type="short-varchar" sql-type="VARCHAR(60)" java-type="String"></field-type-def>
     <field-type-def type="long-varchar" sql-type="VARCHAR(255)" java-type="String"></field-type-def>
-    <field-type-def type="very-long" sql-type="BLOB SUB_TYPE TEXT" java-type="String"></field-type-def>
+    <field-type-def type="very-long" sql-type="BLOB SUB_TYPE 1" java-type="String"></field-type-def>    
 
     <field-type-def type="comment" sql-type="VARCHAR(255)" java-type="String"></field-type-def>
     <field-type-def type="description" sql-type="VARCHAR(255)" java-type="String"></field-type-def>

[Bilgin Ibryam]

Hi Jacques,

adding comments inside <inline-jdbc tag cause errors druing run-install:


2007-11-12 17:12:20,139 (main) [   GenericDelegator.java:115:INFO ] Creating new delegator [default] (main)
     [java] 2007-11-12 17:12:20,209 (main) [            UtilXml.java:672:ERROR] XmlFileLoader: File file:/home/bibryam/workspace/ofbiz-trunk/framework/entity/config/entityengine.xml process fatal error. Line: 447. Error message: Element type "inline-jdbc" must be followed by either attribute specifications, ">" or "/>".
     [java] 2007-11-12 17:12:20,215 (main) [   EntityConfigUtil.java:82 :ERROR]
     [java] ---- exception report ----------------------------------------------------------
     [java] Error loading entity config XML file entityengine.xml
     [java] Exception: org.ofbiz.entity.GenericEntityConfException
     [java] Message: Could not get entity engine XML root element (Error reading entityengine.xml (Element type "inline-jdbc" must be followed by either attribute specifications, ">" or "/>".))
     [java] ---- stack trace ---------------------------------------------------------------