###############################################################################
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements.  See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership.  The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License.  You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied.  See the License for the
# specific language governing permissions and limitations
# under the License.
###############################################################################
53,54c53,54
<         <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" datasource-name="derby"/>
>         <group-map group-name="org.ofbiz.olap" datasource-name="derbyolap"/>
55a56,57
> 
> 
123a126,176
> 
>     <datasource name="derby"
>             helper-class="org.ofbiz.entity.datasource.GenericHelperDAO"
>             schema-name="ofbiz"
>             field-type-name="derby"
>             check-on-start="true"
>             add-missing-on-start="true"
>             use-pk-constraint-names="false"
>             use-indices-unique="false"
>             alias-view-columns="false">
>         <read-data reader-name="seed"/>
>         <read-data reader-name="seed-initial"/>
>         <read-data reader-name="demo"/>
>         <read-data reader-name="ext"/>
>         <inline-jdbc
>                 jdbc-driver="org.apache.derby.jdbc.ClientDriver"
>                 jdbc-uri="jdbc:derby://localhost:1527/ofbiz;create=true"
>                 jdbc-username="ofbiz"
>                 jdbc-password="ofbiz"
>                 isolation-level="ReadCommitted"
>                 pool-minsize="2"
>                 pool-maxsize="250"/>
>         <!-- <jndi-jdbc jndi-server-name="localjndi" jndi-name="java:/DerbyDataSource" isolation-level="ReadCommitted"/> -->
>     </datasource>
> 
> 
>     <datasource name="derbyolap"
>             helper-class="org.ofbiz.entity.datasource.GenericHelperDAO"
>             schema-name="ofbiz"
>             field-type-name="derby"
>             check-on-start="true"
>             add-missing-on-start="true"
>             use-pk-constraint-names="false"
>             use-indices-unique="false"
>             alias-view-columns="false">
>         <read-data reader-name="seed"/>
>         <read-data reader-name="seed-initial"/>
>         <read-data reader-name="demo"/>
>         <read-data reader-name="ext"/>
>         <inline-jdbc
>                 jdbc-driver="org.apache.derby.jdbc.ClientDriver"
>                 jdbc-uri="jdbc:derby://localhost:1527/ofbiz;create=true"
>                 jdbc-username="ofbiz"
>                 jdbc-password="ofbiz"
>                 isolation-level="ReadCommitted"
>                 pool-minsize="2"
>                 pool-maxsize="250"/>
>         <!-- <jndi-jdbc jndi-server-name="localjndi" jndi-name="java:/DerbyDataSource" isolation-level="ReadCommitted"/> -->
>     </datasource>
> 
>