svn commit: r1531269 - /ofbiz/trunk/framework/entity/config/entityengine.xml

Author: jleroux
Date: Fri Oct 11 12:21:51 2013
New Revision: 1531269

URL: http://svn.apache.org/r1531269
Log:
This completes r1530237 where fieldtypepostnew.xml has been removed.
* Removes useless commented out blocks of <group-maps in <delegators definitions
* Removes now useless localpostnew <datasource definition
* Default the result-fetch-size attribute to 50, and comment about older unsupported versions of jdbc drivers

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

Modified: ofbiz/trunk/framework/entity/config/entityengine.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/config/entityengine.xml?rev=1531269&r1=1531268&r2=1531269&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/config/entityengine.xml (original)
+++ ofbiz/trunk/framework/entity/config/entityengine.xml Fri Oct 11 12:21:51 2013
@@ -55,23 +55,11 @@ access. For a detailed description see t
         <group-map group-name="org.ofbiz" datasource-name="localderby"/>
         <group-map group-name="org.ofbiz.olap" datasource-name="localderbyolap"/>
         <group-map group-name="org.ofbiz.tenant" datasource-name="localderbytenant"/>
-        <!-- <group-map group-name="org.ofbiz" datasource-name="localmysql"/>
-        <group-map group-name="org.ofbiz.olap" datasource-name="localmysqlolap"/>
-        <group-map group-name="org.ofbiz.tenant" datasource-name="localmysqltenant"/>  -->
-        <!-- <group-map group-name="org.ofbiz" datasource-name="localpostnew"/>
-        <group-map group-name="org.ofbiz.olap" datasource-name="localpostolap"/>
-        <group-map group-name="org.ofbiz.tenant" datasource-name="localposttenant"/> -->
     </delegator>
     <delegator name="default-no-eca" entity-model-reader="main" entity-group-reader="main" entity-eca-reader="main" entity-eca-enabled="false" distributed-cache-clear-enabled="false">
         <group-map group-name="org.ofbiz" datasource-name="localderby"/>
         <group-map group-name="org.ofbiz.olap" datasource-name="localderbyolap"/>
         <group-map group-name="org.ofbiz.tenant" datasource-name="localderbytenant"/>
-        <!-- <group-map group-name="org.ofbiz" datasource-name="localmysql"/>
-        <group-map group-name="org.ofbiz.olap" datasource-name="localmysqlolap"/>
-        <group-map group-name="org.ofbiz.tenant" datasource-name="localmysqltenant"/>  -->
-        <!-- <group-map group-name="org.ofbiz" datasource-name="localpostnew"/>
-        <group-map group-name="org.ofbiz.olap" datasource-name="localpostolap"/>
-        <group-map group-name="org.ofbiz.tenant" datasource-name="localposttenant"/>  -->
     </delegator>
 
     <!-- be sure that your default delegator (or the one you use) uses the same datasource for test. You must run "ant load-demo" before running "ant run-tests" -->
@@ -79,12 +67,6 @@ access. For a detailed description see t
         <group-map group-name="org.ofbiz" datasource-name="localderby"/>
         <group-map group-name="org.ofbiz.olap" datasource-name="localderbyolap"/>
         <group-map group-name="org.ofbiz.tenant" datasource-name="localderbytenant"/>
-        <!-- <group-map group-name="org.ofbiz" datasource-name="localmysql"/>
-        <group-map group-name="org.ofbiz.olap" datasource-name="localmysqlolap"/>
-        <group-map group-name="org.ofbiz.tenant" datasource-name="localmysqltenant"/>  -->
-        <!-- <group-map group-name="org.ofbiz" datasource-name="localpostnew"/>
-        <group-map group-name="org.ofbiz.olap" datasource-name="localpostolap"/>
-        <group-map group-name="org.ofbiz.tenant" datasource-name="localposttenant"/>  -->
     </delegator>
   
     <!-- need to at least define a name for each component to use -->
@@ -472,10 +454,10 @@ access. For a detailed description see t
             alias-view-columns="false"
             join-style="ansi"
             use-binary-type-for-blob="true"
-            use-order-by-nulls="true">
-            <!-- use this attribute to make the EntityListIterator more effective for pgjdbc 7.5devel and later:
-                result-fetch-size="50"
-            -->
+            use-order-by-nulls="true"
+            result-fetch-size="50"> <!-- Comment out the result-fetch-size attribute for jdbc driver versions older than 8.0.
+            Not recommended to use those though. They are archived unsupported versions: http://jdbc.postgresql.org/download.html -->
+        
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
         <read-data reader-name="seed-initial"/>
@@ -501,45 +483,7 @@ access. For a detailed description see t
         <!-- <tyrex-dataSource dataSource-name="localpostgres" isolation-level="ReadCommitted"/> -->
     </datasource>
 
-    <!-- use localpostnew for NEW installations (don't switch from localpostgres) and for PostgreSQL
-     at or above 8.1 (for more information see the comment in the fieldtype file "fieldtypepostnew") -->
-
-    <datasource name="localpostnew"
-        helper-class="org.ofbiz.entity.datasource.GenericHelperDAO"
-        schema-name="public"
-        field-type-name="postnew"
-        check-on-start="true"
-        add-missing-on-start="true"
-        use-fk-initially-deferred="false"
-        alias-view-columns="false"
-        join-style="ansi"
-        result-fetch-size="50"
-        use-binary-type-for-blob="true"
-        use-order-by-nulls="true">
-        <read-data reader-name="tenant"/>
-        <read-data reader-name="seed"/>
-        <read-data reader-name="seed-initial"/>
-        <read-data reader-name="demo"/>
-        <read-data reader-name="ext"/>
-        <read-data reader-name="ext-test"/>
-        <read-data reader-name="ext-demo"/>
-        <inline-jdbc
-            jdbc-driver="org.postgresql.Driver"
-            jdbc-uri="jdbc:postgresql://127.0.0.1/ofbiz"
-            jdbc-username="ofbiz"
-            jdbc-password="ofbiz"
-            isolation-level="ReadCommitted"
-            pool-minsize="2"
-            pool-maxsize="250"
-            time-between-eviction-runs-millis="600000"/><!-- Be warned that at this date (2009-09-20) the max_connections parameters in postgresql.conf
-                is set by default to 100 by the initdb process see http://www.postgresql.org/docs/8.4/static/runtime-config-connection.html#GUC-MAX-CONNECTIONS-->
-        
-        <!-- <jndi-jdbc jndi-server-name="default" jndi-name="java:comp/env/jdbc/localpostgres" isolation-level="ReadCommitted"/>-->
-        <!-- <jndi-jdbc jndi-server-name="default" jndi-name="comp/env/jdbc/xa/localpostgres" isolation-level="ReadCommitted"/> --> <!-- Orion Style JNDI name -->
-        <!-- <jndi-jdbc jndi-server-name="localweblogic" jndi-name="PostgresDataSource"/> --> <!-- Weblogic Style JNDI name -->
-        <!-- <jndi-jdbc jndi-server-name="default" jndi-name="jdbc/localpostgres" isolation-level="ReadCommitted"/> --> <!-- JRun4 Style JNDI name -->
-        <!-- <tyrex-dataSource dataSource-name="localpostgres" isolation-level="ReadCommitted"/> -->
-    </datasource>
+    
     <datasource name="localpostolap"
             helper-class="org.ofbiz.entity.datasource.GenericHelperDAO"
             schema-name="public"
@@ -576,6 +520,7 @@ access. For a detailed description see t
         <!-- <jndi-jdbc jndi-server-name="default" jndi-name="jdbc/localpostgres" isolation-level="ReadCommitted"/> --> <!-- JRun4 Style JNDI name -->
         <!-- <tyrex-dataSource dataSource-name="localpostgres" isolation-level="ReadCommitted"/> -->
     </datasource>
+    
     <datasource name="localposttenant"
             helper-class="org.ofbiz.entity.datasource.GenericHelperDAO"
             schema-name="public"