| Index: framework/entity/config/entityengine.xml |
| =================================================================== |
| --- framework/entity/config/entityengine.xml (revision 661518) |
| +++ framework/entity/config/entityengine.xml (working copy) |
| @@ -28,15 +28,15 @@ |
| |
| <!-- the transaction factory class to use, one is needed for each way of getting JTA interfaces --> |
| <!-- Use this one for Geronimo --> |
| - <transaction-factory class="org.ofbiz.geronimo.GeronimoTransactionFactory"/> |
| + <!--<transaction-factory class="org.ofbiz.geronimo.GeronimoTransactionFactory"/>--> |
| |
| <!-- Use this one for getting the JTA objects from JNDI --> |
| - <!-- NOTE: to use the JndiFactory you must specify the necessary JNDI properties |
| + <!-- NOTE: to use the JndiFactory you must specify the necessary JNDI properties --> |
| <transaction-factory class="org.ofbiz.entity.transaction.JNDIFactory"> |
| <user-transaction-jndi jndi-server-name="default" jndi-name="java:comp/UserTransaction"/> |
| - <transaction-manager-jndi jndi-server-name="default" jndi-name="java:comp/UserTransaction"/> |
| + <transaction-manager-jndi jndi-server-name="default" jndi-name="java:/TransactionManager"/> |
| </transaction-factory> |
| - --> |
| + |
| <!-- |
| It is common to use UserTransaction for the TransactionManager, but if that doesn't work, try this: <transaction-manager-jndi jndi-server-name="default" jndi-name="java:comp/TransactionManager"/> |
| Common UserTransaction locations: |
| @@ -160,6 +160,7 @@ |
| <read-data reader-name="seed-initial"/> |
| <read-data reader-name="demo"/> |
| <read-data reader-name="ext"/> |
| + <!-- |
| <inline-jdbc |
| jdbc-driver="org.apache.derby.jdbc.EmbeddedDriver" |
| jdbc-uri="jdbc:derby:ofbiz;create=true" |
| @@ -168,7 +169,8 @@ |
| isolation-level="ReadCommitted" |
| pool-minsize="2" |
| pool-maxsize="250"/> |
| - <!-- <jndi-jdbc jndi-server-name="localjndi" jndi-name="java:/DerbyDataSource" isolation-level="ReadCommitted"/> --> |
| + --> |
| + <jndi-jdbc jndi-server-name="localjndi" jndi-name="java:/OFBizDS" isolation-level="ReadCommitted"/> |
| </datasource> |
| <datasource name="localderbyodbc" |
| helper-class="org.ofbiz.entity.datasource.GenericHelperDAO" |
| @@ -179,6 +181,7 @@ |
| use-pk-constraint-names="false" |
| use-indices-unique="false" |
| alias-view-columns="false"> |
| + <!-- |
| <inline-jdbc |
| jdbc-driver="org.apache.derby.jdbc.EmbeddedDriver" |
| jdbc-uri="jdbc:derby:ofbizodbc;create=true" |
| @@ -187,7 +190,8 @@ |
| isolation-level="ReadCommitted" |
| pool-minsize="2" |
| pool-maxsize="250"/> |
| - <!-- <jndi-jdbc jndi-server-name="localjndi" jndi-name="java:/DerbyDataSource" isolation-level="ReadCommitted"/> --> |
| + --> |
| + <jndi-jdbc jndi-server-name="localjndi" jndi-name="java:/OFBizOdbcDS" isolation-level="ReadCommitted"/> |
| </datasource> |
| <datasource name="localderbyolap" |
| helper-class="org.ofbiz.entity.datasource.GenericHelperDAO" |
| @@ -202,6 +206,7 @@ |
| <read-data reader-name="seed-initial"/> |
| <read-data reader-name="demo"/> |
| <read-data reader-name="ext"/> |
| + <!-- |
| <inline-jdbc |
| jdbc-driver="org.apache.derby.jdbc.EmbeddedDriver" |
| jdbc-uri="jdbc:derby:ofbizolap;create=true" |
| @@ -210,7 +215,8 @@ |
| isolation-level="ReadCommitted" |
| pool-minsize="2" |
| pool-maxsize="250"/> |
| - <!-- <jndi-jdbc jndi-server-name="localjndi" jndi-name="java:/DerbyDataSource" isolation-level="ReadCommitted"/> --> |
| + --> |
| + <jndi-jdbc jndi-server-name="localjndi" jndi-name="java:/OFBizOlapDS" isolation-level="ReadCommitted"/> |
| </datasource> |
| |
| <datasource name="localcloudscape" |
