Author: shijh
Date: Thu Jul 9 05:52:01 2015
New Revision: 1689990
URL: http://svn.apache.org/r1689990
Log:
OFBIZ-6553.
1. I changed passport enditymodel.xml to remove the 3 warnings on
ThirdPartyLogin during OFBiz start.
2. Remove classpath of lib/* from ofbiz-component.xml as the path doesn't exist
in the component.
Modified:
ofbiz/trunk/specialpurpose/passport/entitydef/entitymodel.xml
ofbiz/trunk/specialpurpose/passport/ofbiz-component.xml
Modified: ofbiz/trunk/specialpurpose/passport/entitydef/entitymodel.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/passport/entitydef/entitymodel.xml?rev=1689990&r1=1689989&r2=1689990&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/passport/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/specialpurpose/passport/entitydef/entitymodel.xml Thu Jul 9
05:52:01 2015
@@ -40,10 +40,8 @@ under the License.
<relation type="one" fk-name="PROD_STORE_LOGINS"
rel-entity-name="ProductStore">
<key-map field-name="productStoreId"/>
</relation>
- <relation type="one" fk-name="LOGIN_METH_TYPE_ID"
rel-entity-name="EnumerationType">
+ <relation type="many" rel-entity-name="EnumerationType">
<key-map field-name="loginMethTypeId" rel-field-name="enumTypeId"/>
- </relation>
- <relation type="one" fk-name="LOGIN_PROVIDER_ID"
rel-entity-name="EnumerationType">
<key-map field-name="loginProviderId" rel-field-name="enumTypeId"/>
</relation>
</entity>
@@ -99,7 +97,7 @@ under the License.
<field name="thruDate" type="date-time"></field>
<prim-key field="productStoreId"/>
<prim-key field="fromDate"/>
- <relation type="one" fk-name="STORE_OAUTH_LINKEDIN"
rel-entity-name="ProductStore">
+ <relation type="one" fk-name="OAUTH2_LINKEDIN"
rel-entity-name="ProductStore">
<key-map field-name="productStoreId"/>
</relation>
</entity>
@@ -113,7 +111,7 @@ under the License.
<field name="envPrefix" type="short-varchar"></field>
<field name="accessToken" type="value"></field>
<prim-key field="linkedInUserId"/>
- <relation type="one" fk-name="LINKEDIN_USER_STORE"
rel-entity-name="ProductStore">
+ <relation type="one" fk-name="LINKEDIN_USER"
rel-entity-name="ProductStore">
<key-map field-name="productStoreId"/>
</relation>
</entity>
Modified: ofbiz/trunk/specialpurpose/passport/ofbiz-component.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/passport/ofbiz-component.xml?rev=1689990&r1=1689989&r2=1689990&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/passport/ofbiz-component.xml (original)
+++ ofbiz/trunk/specialpurpose/passport/ofbiz-component.xml Thu Jul 9 05:52:01
2015
@@ -10,7 +10,6 @@
<!-- load single or multiple external libraries -->
<classpath type="jar" location="build/lib/*"/>
- <classpath type="jar" location="lib/*"/>
<!-- entity resources: model(s), eca(s), group, and data definitions -->
<entity-resource type="model" reader-name="main" loader="main"
location="entitydef/entitymodel.xml"/>
