Fixed issue 29894: Merged [gsi-removal] project
authorDavid Baz Fayos <david.baz@openbravo.com>
Tue, 19 May 2015 22:35:00 +0200
changeset 26718 02b3ccc6fd3f
parent 26706 4f76755457e1 (current diff)
parent 26717 625fa73ea6b5 (diff)
child 26719 a2b17b6cab3b
Fixed issue 29894: Merged [gsi-removal] project

http://wiki.openbravo.com/w/index.php?title=Projects:OpenID_Removal
modules/org.openbravo.service.integration.google/src-db/database/model/functions/OBSEIG_UPDATE_ACCESS.xml
modules/org.openbravo.service.integration.google/src-db/database/model/tables/OBSEIG_DEFAULTS.xml
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_COLUMN.xml
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_ELEMENT.xml
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_EP_PROCEDURES.xml
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_FIELD.xml
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MENU.xml
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MESSAGE.xml
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODEL_OBJECT.xml
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_TAB.xml
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_TABLE.xml
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_TREENODE.xml
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_WINDOW.xml
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/OBUIAPP_MENU_PARAMETERS.xml
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/OBUIAPP_VIEW_IMPL.xml
modules/org.openbravo.service.integration.google/src/org/openbravo/service/integration/google/GoogleAuthServlet.java
modules/org.openbravo.service.integration.google/src/org/openbravo/service/integration/google/GoogleIntegrationComponentProvider.java
modules/org.openbravo.service.integration.google/web/images/google.png
modules/org.openbravo.service.integration.google/web/org.openbravo.service.integration.google/js/obsegi-account-association-view.js
modules/org.openbravo.service.integration.openid/lib/runtime/guice-2.0.jar
modules/org.openbravo.service.integration.openid/lib/runtime/httpclient-4.0.jar
modules/org.openbravo.service.integration.openid/lib/runtime/httpcore-4.0.1.jar
modules/org.openbravo.service.integration.openid/lib/runtime/httpmime-4.1.jar
modules/org.openbravo.service.integration.openid/lib/runtime/openid4java-0.9.6.jar
modules/org.openbravo.service.integration.openid/src-db/database/model/tables/OBSOID_USER_IDENTIFIER.xml
modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_COLUMN.xml
modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_ELEMENT.xml
modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_FIELD.xml
modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_TAB.xml
modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_TABLE.xml
modules/org.openbravo.service.integration.openid/src/org/openbravo/service/integration/openid/OpenIDManager.java
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
--- a/.classpath.template	Tue May 19 16:37:18 2015 +0000
+++ b/.classpath.template	Tue May 19 22:35:00 2015 +0200
@@ -19,8 +19,6 @@
 	<classpathentry kind="src" path="modules/org.openbravo.userinterface.selector/src"/>
 	<classpathentry kind="src" path="modules/org.openbravo.userinterface.smartclient/src"/>
 	<classpathentry kind="src" path="modules/org.openbravo.service.datasource/src"/>
-	<classpathentry kind="src" path="modules/org.openbravo.service.integration.openid/src"/>
-	<classpathentry kind="src" path="modules/org.openbravo.service.integration.google/src"/>
 	<classpathentry kind="src" path="modules/org.openbravo.utility.cleanup.log/src"/>
 	<classpathentry including="quartz.properties" kind="src" path="config"/>
 	<classpathentry kind="src" path="src-gen"/>
--- a/legal/Licensing.txt	Tue May 19 16:37:18 2015 +0000
+++ b/legal/Licensing.txt	Tue May 19 22:35:00 2015 +0200
@@ -235,7 +235,6 @@
 # httpclient-4.0.jar
 # httpmime-4.1.jar
 # guice-2.0.jar
-# openid4java-0.9.6.jar
 Under the Apache 2.0 license (included as Apache_license-2.0.txt in this folder)
 
 # jslint4java-1.4.7.jar
Binary file modules/org.openbravo.client.application/lib/runtime/guice-2.0.jar has changed
Binary file modules/org.openbravo.client.application/lib/runtime/httpclient-4.0.jar has changed
Binary file modules/org.openbravo.client.application/lib/runtime/httpcore-4.0.1.jar has changed
Binary file modules/org.openbravo.client.application/lib/runtime/httpmime-4.1.jar has changed
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml	Tue May 19 16:37:18 2015 +0000
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml	Tue May 19 22:35:00 2015 +0200
@@ -132,6 +132,18 @@
 <!--07AA67107E904AC9A1E80B407C9894BB-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--07AA67107E904AC9A1E80B407C9894BB--></AD_MESSAGE>
 
+<!--090A0260AFDA4799923FC2ADE44EB55B--><AD_MESSAGE>
+<!--090A0260AFDA4799923FC2ADE44EB55B-->  <AD_MESSAGE_ID><![CDATA[090A0260AFDA4799923FC2ADE44EB55B]]></AD_MESSAGE_ID>
+<!--090A0260AFDA4799923FC2ADE44EB55B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--090A0260AFDA4799923FC2ADE44EB55B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--090A0260AFDA4799923FC2ADE44EB55B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--090A0260AFDA4799923FC2ADE44EB55B-->  <VALUE><![CDATA[OBUIAPP_gSignInButtonDemoProfessional]]></VALUE>
+<!--090A0260AFDA4799923FC2ADE44EB55B-->  <MSGTEXT><![CDATA[The <a href="http://centralrepository.openbravo.com/openbravo/org.openbravo.forge.ui/sso/ForgeModuleDetail/Google-Sign-In" target="_blank">module</a> that contains the <a href="http://wiki.openbravo.com/wiki/Configuration_Manual/Google_Integration" target="_blank">log in to application using Google Account</a> feature is not installed. Ask your System Administrator to install it.]]></MSGTEXT>
+<!--090A0260AFDA4799923FC2ADE44EB55B-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--090A0260AFDA4799923FC2ADE44EB55B-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--090A0260AFDA4799923FC2ADE44EB55B-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--090A0260AFDA4799923FC2ADE44EB55B--></AD_MESSAGE>
+
 <!--090A37D22DDB1C89012DDB22CE910012--><AD_MESSAGE>
 <!--090A37D22DDB1C89012DDB22CE910012-->  <AD_MESSAGE_ID><![CDATA[090A37D22DDB1C89012DDB22CE910012]]></AD_MESSAGE_ID>
 <!--090A37D22DDB1C89012DDB22CE910012-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -581,6 +593,18 @@
 <!--42181711B0664B9A898BDE8754ADA4E0-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--42181711B0664B9A898BDE8754ADA4E0--></AD_MESSAGE>
 
+<!--42B286FCB7054BD49A7FCDE676DB736A--><AD_MESSAGE>
+<!--42B286FCB7054BD49A7FCDE676DB736A-->  <AD_MESSAGE_ID><![CDATA[42B286FCB7054BD49A7FCDE676DB736A]]></AD_MESSAGE_ID>
+<!--42B286FCB7054BD49A7FCDE676DB736A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--42B286FCB7054BD49A7FCDE676DB736A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--42B286FCB7054BD49A7FCDE676DB736A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--42B286FCB7054BD49A7FCDE676DB736A-->  <VALUE><![CDATA[OBUIAPP_gSignInButtonDemoCommunity]]></VALUE>
+<!--42B286FCB7054BD49A7FCDE676DB736A-->  <MSGTEXT><![CDATA[<a href="http://wiki.openbravo.com/wiki/Configuration_Manual/Google_Integration" target="_blank">Log in to application using Google Account</a> is a Premium Feature]]></MSGTEXT>
+<!--42B286FCB7054BD49A7FCDE676DB736A-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--42B286FCB7054BD49A7FCDE676DB736A-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--42B286FCB7054BD49A7FCDE676DB736A-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--42B286FCB7054BD49A7FCDE676DB736A--></AD_MESSAGE>
+
 <!--48A6793A3C364216B184A33117EF7ED1--><AD_MESSAGE>
 <!--48A6793A3C364216B184A33117EF7ED1-->  <AD_MESSAGE_ID><![CDATA[48A6793A3C364216B184A33117EF7ED1]]></AD_MESSAGE_ID>
 <!--48A6793A3C364216B184A33117EF7ED1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -821,6 +845,18 @@
 <!--6831E84EB2124F08B3FCEF6F50CF8AD1-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--6831E84EB2124F08B3FCEF6F50CF8AD1--></AD_MESSAGE>
 
+<!--699499DEBB904E1B84D4CB28600647C7--><AD_MESSAGE>
+<!--699499DEBB904E1B84D4CB28600647C7-->  <AD_MESSAGE_ID><![CDATA[699499DEBB904E1B84D4CB28600647C7]]></AD_MESSAGE_ID>
+<!--699499DEBB904E1B84D4CB28600647C7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--699499DEBB904E1B84D4CB28600647C7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--699499DEBB904E1B84D4CB28600647C7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--699499DEBB904E1B84D4CB28600647C7-->  <VALUE><![CDATA[OBUIAPP_SignIn]]></VALUE>
+<!--699499DEBB904E1B84D4CB28600647C7-->  <MSGTEXT><![CDATA[Sign in using]]></MSGTEXT>
+<!--699499DEBB904E1B84D4CB28600647C7-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--699499DEBB904E1B84D4CB28600647C7-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--699499DEBB904E1B84D4CB28600647C7-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--699499DEBB904E1B84D4CB28600647C7--></AD_MESSAGE>
+
 <!--6B478D5FA6E442B19E29F29AFF70EDBA--><AD_MESSAGE>
 <!--6B478D5FA6E442B19E29F29AFF70EDBA-->  <AD_MESSAGE_ID><![CDATA[6B478D5FA6E442B19E29F29AFF70EDBA]]></AD_MESSAGE_ID>
 <!--6B478D5FA6E442B19E29F29AFF70EDBA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1665,6 +1701,18 @@
 <!--E16F552C980C451089FF20C93122A331-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--E16F552C980C451089FF20C93122A331--></AD_MESSAGE>
 
+<!--E1B1F9C89283486F90FEE70EDC716EB7--><AD_MESSAGE>
+<!--E1B1F9C89283486F90FEE70EDC716EB7-->  <AD_MESSAGE_ID><![CDATA[E1B1F9C89283486F90FEE70EDC716EB7]]></AD_MESSAGE_ID>
+<!--E1B1F9C89283486F90FEE70EDC716EB7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--E1B1F9C89283486F90FEE70EDC716EB7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--E1B1F9C89283486F90FEE70EDC716EB7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--E1B1F9C89283486F90FEE70EDC716EB7-->  <VALUE><![CDATA[OBUIAPP_gSignInButtonDemoAltMsg]]></VALUE>
+<!--E1B1F9C89283486F90FEE70EDC716EB7-->  <MSGTEXT><![CDATA[Sign in using your Google Account]]></MSGTEXT>
+<!--E1B1F9C89283486F90FEE70EDC716EB7-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--E1B1F9C89283486F90FEE70EDC716EB7-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--E1B1F9C89283486F90FEE70EDC716EB7-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--E1B1F9C89283486F90FEE70EDC716EB7--></AD_MESSAGE>
+
 <!--E20A23145D554996A09BC927B847F3BB--><AD_MESSAGE>
 <!--E20A23145D554996A09BC927B847F3BB-->  <AD_MESSAGE_ID><![CDATA[E20A23145D554996A09BC927B847F3BB]]></AD_MESSAGE_ID>
 <!--E20A23145D554996A09BC927B847F3BB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.service.integration.google/src-db/database/model/functions/OBSEIG_UPDATE_ACCESS.xml	Tue May 19 16:37:18 2015 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-<?xml version="1.0"?>
-  <database name="FUNCTION OBSEIG_UPDATE_ACCESS">
-    <function name="OBSEIG_UPDATE_ACCESS" type="NULL">
-      <parameter name="p_ep_instance_id" type="VARCHAR" mode="in">
-        <default/>
-      </parameter>
-      <body><![CDATA[/*************************************************************************
-* The contents of this file are subject to the Openbravo  Public  License
-* Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
-* Version 1.1  with a permitted attribution clause; you may not  use this
-* file except in compliance with the License. You  may  obtain  a copy of
-* the License at http://www.openbravo.com/legal/license.html
-* Software distributed under the License  is  distributed  on  an "AS IS"
-* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-* License for the specific  language  governing  rights  and  limitations
-* under the License.
-* The Original Code is Openbravo ERP.
-* The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2011 Openbravo SLU
-* All Rights Reserved.
-* Contributor(s):  ______________________________________.
-************************************************************************/
-
-BEGIN
-
-  INSERT INTO OBUIAPP_View_Role_Access
-    (
-      OBUIAPP_View_Role_Access_ID, OBUIAPP_View_Impl_ID, AD_Role_ID, AD_Client_ID,
-      AD_Org_ID, IsActive, Created,
-      CreatedBy, Updated, UpdatedBy
-    )
-  SELECT get_uuid(), V.OBUIAPP_View_Impl_ID, R.AD_ROLE_ID, R.AD_CLIENT_ID,
-    R.AD_ORG_ID, 'Y', now(),
-    '0', now(), '0'
-  FROM OBUIAPP_View_Impl V, AD_Role R
-  WHERE R.isManual = 'N'
-  AND V.isActive = 'Y'
-  AND V.AD_Module_ID = 'FF8080813129ADA401312CA1222A0005'
-    AND NOT EXISTS (SELECT 1
-                     FROM OBUIAPP_View_Role_Access
-                    WHERE OBUIAPP_View_Impl_ID = V.OBUIAPP_View_Impl_ID
-                      AND AD_ROLE_ID = R.AD_ROLE_ID
-                      AND (R.ISADVANCED = 'Y' OR V.ISADVANCEDFEATURE = 'N'));
-END OBSEIG_UPDATE_ACCESS
-]]></body>
-    </function>
-  </database>
--- a/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_EP_PROCEDURES.xml	Tue May 19 16:37:18 2015 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<data>
-<!--FF808081318454090131846F46FD001C--><AD_EP_PROCEDURES>
-<!--FF808081318454090131846F46FD001C-->  <AD_EP_PROCEDURES_ID><![CDATA[FF808081318454090131846F46FD001C]]></AD_EP_PROCEDURES_ID>
-<!--FF808081318454090131846F46FD001C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--FF808081318454090131846F46FD001C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--FF808081318454090131846F46FD001C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--FF808081318454090131846F46FD001C-->  <AD_EXTENSION_POINTS_ID><![CDATA[8261F79453B64AC7998873A9F81A1E5A]]></AD_EXTENSION_POINTS_ID>
-<!--FF808081318454090131846F46FD001C-->  <PROCEDURENAME><![CDATA[OBSEIG_Update_Access]]></PROCEDURENAME>
-<!--FF808081318454090131846F46FD001C-->  <AD_MODULE_ID><![CDATA[FF8080813129ADA401312CA1222A0005]]></AD_MODULE_ID>
-<!--FF808081318454090131846F46FD001C--></AD_EP_PROCEDURES>
-
-</data>
--- a/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_FIELD.xml	Tue May 19 16:37:18 2015 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,197 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<data>
-<!--07704D7F8EC54861B176ACC4F0803A47--><AD_FIELD>
-<!--07704D7F8EC54861B176ACC4F0803A47-->  <AD_FIELD_ID><![CDATA[07704D7F8EC54861B176ACC4F0803A47]]></AD_FIELD_ID>
-<!--07704D7F8EC54861B176ACC4F0803A47-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--07704D7F8EC54861B176ACC4F0803A47-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--07704D7F8EC54861B176ACC4F0803A47-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--07704D7F8EC54861B176ACC4F0803A47-->  <NAME><![CDATA[Default Role]]></NAME>
-<!--07704D7F8EC54861B176ACC4F0803A47-->  <DESCRIPTION><![CDATA[Defines the default role used when creating a new user]]></DESCRIPTION>
-<!--07704D7F8EC54861B176ACC4F0803A47-->  <HELP><![CDATA[Defines the default role used when the process of login in with a Google Account doesn't find any Openbravo user associated with the account.]]></HELP>
-<!--07704D7F8EC54861B176ACC4F0803A47-->  <ISCENTRALLYMAINTAINED><![CDATA[N]]></ISCENTRALLYMAINTAINED>
-<!--07704D7F8EC54861B176ACC4F0803A47-->  <AD_TAB_ID><![CDATA[FF8080813161A3D30131620862BF0014]]></AD_TAB_ID>
-<!--07704D7F8EC54861B176ACC4F0803A47-->  <AD_COLUMN_ID><![CDATA[5887370AAF5A47C3AE119D29C4442A43]]></AD_COLUMN_ID>
-<!--07704D7F8EC54861B176ACC4F0803A47-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
-<!--07704D7F8EC54861B176ACC4F0803A47-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--07704D7F8EC54861B176ACC4F0803A47-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
-<!--07704D7F8EC54861B176ACC4F0803A47-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--07704D7F8EC54861B176ACC4F0803A47-->  <SEQNO><![CDATA[40]]></SEQNO>
-<!--07704D7F8EC54861B176ACC4F0803A47-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
-<!--07704D7F8EC54861B176ACC4F0803A47-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
-<!--07704D7F8EC54861B176ACC4F0803A47-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--07704D7F8EC54861B176ACC4F0803A47-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
-<!--07704D7F8EC54861B176ACC4F0803A47-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
-<!--07704D7F8EC54861B176ACC4F0803A47-->  <AD_MODULE_ID><![CDATA[FF8080813129ADA401312CA1222A0005]]></AD_MODULE_ID>
-<!--07704D7F8EC54861B176ACC4F0803A47-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
-<!--07704D7F8EC54861B176ACC4F0803A47-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
-<!--07704D7F8EC54861B176ACC4F0803A47-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
-<!--07704D7F8EC54861B176ACC4F0803A47-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
-<!--07704D7F8EC54861B176ACC4F0803A47--></AD_FIELD>
-
-<!--181EE3DEC27940D2A9E82C67B895AF18--><AD_FIELD>
-<!--181EE3DEC27940D2A9E82C67B895AF18-->  <AD_FIELD_ID><![CDATA[181EE3DEC27940D2A9E82C67B895AF18]]></AD_FIELD_ID>
-<!--181EE3DEC27940D2A9E82C67B895AF18-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--181EE3DEC27940D2A9E82C67B895AF18-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--181EE3DEC27940D2A9E82C67B895AF18-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--181EE3DEC27940D2A9E82C67B895AF18-->  <NAME><![CDATA[Organization]]></NAME>
-<!--181EE3DEC27940D2A9E82C67B895AF18-->  <DESCRIPTION><![CDATA[Organizational entity within client]]></DESCRIPTION>
-<!--181EE3DEC27940D2A9E82C67B895AF18-->  <HELP><![CDATA[An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.]]></HELP>
-<!--181EE3DEC27940D2A9E82C67B895AF18-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--181EE3DEC27940D2A9E82C67B895AF18-->  <AD_TAB_ID><![CDATA[FF8080813161A3D30131620862BF0014]]></AD_TAB_ID>
-<!--181EE3DEC27940D2A9E82C67B895AF18-->  <AD_COLUMN_ID><![CDATA[52A6D1BB00694B46BCC737240A27BEA1]]></AD_COLUMN_ID>
-<!--181EE3DEC27940D2A9E82C67B895AF18-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
-<!--181EE3DEC27940D2A9E82C67B895AF18-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
-<!--181EE3DEC27940D2A9E82C67B895AF18-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
-<!--181EE3DEC27940D2A9E82C67B895AF18-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--181EE3DEC27940D2A9E82C67B895AF18-->  <SEQNO><![CDATA[10]]></SEQNO>
-<!--181EE3DEC27940D2A9E82C67B895AF18-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
-<!--181EE3DEC27940D2A9E82C67B895AF18-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
-<!--181EE3DEC27940D2A9E82C67B895AF18-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--181EE3DEC27940D2A9E82C67B895AF18-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
-<!--181EE3DEC27940D2A9E82C67B895AF18-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
-<!--181EE3DEC27940D2A9E82C67B895AF18-->  <AD_MODULE_ID><![CDATA[FF8080813129ADA401312CA1222A0005]]></AD_MODULE_ID>
-<!--181EE3DEC27940D2A9E82C67B895AF18-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
-<!--181EE3DEC27940D2A9E82C67B895AF18-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
-<!--181EE3DEC27940D2A9E82C67B895AF18-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
-<!--181EE3DEC27940D2A9E82C67B895AF18-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
-<!--181EE3DEC27940D2A9E82C67B895AF18--></AD_FIELD>
-
-<!--37CD013C64354C66BE23525F241A3A99--><AD_FIELD>
-<!--37CD013C64354C66BE23525F241A3A99-->  <AD_FIELD_ID><![CDATA[37CD013C64354C66BE23525F241A3A99]]></AD_FIELD_ID>
-<!--37CD013C64354C66BE23525F241A3A99-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--37CD013C64354C66BE23525F241A3A99-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--37CD013C64354C66BE23525F241A3A99-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--37CD013C64354C66BE23525F241A3A99-->  <NAME><![CDATA[Active]]></NAME>
-<!--37CD013C64354C66BE23525F241A3A99-->  <DESCRIPTION><![CDATA[A flag indicating whether this record is available for use or de-activated.]]></DESCRIPTION>
-<!--37CD013C64354C66BE23525F241A3A99-->  <HELP><![CDATA[There are two methods of making records unavailable in the system: One is to delete the record, the other is to de-activate the record. A de-activated record is not available for selection, but available for reporting. There are two reasons for de-activating and not deleting records: 
-(1) The system requires the record for auditing purposes.
-(2) The record is referenced by other records. E.g., you cannot delete a Business Partner, if there are existing invoices for it. By de-activating the Business Partner you prevent it from being used in future transactions.]]></HELP>
-<!--37CD013C64354C66BE23525F241A3A99-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--37CD013C64354C66BE23525F241A3A99-->  <AD_TAB_ID><![CDATA[FF8080813161A3D30131620862BF0014]]></AD_TAB_ID>
-<!--37CD013C64354C66BE23525F241A3A99-->  <AD_COLUMN_ID><![CDATA[FA207954D615418C8C2B34416215E698]]></AD_COLUMN_ID>
-<!--37CD013C64354C66BE23525F241A3A99-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
-<!--37CD013C64354C66BE23525F241A3A99-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--37CD013C64354C66BE23525F241A3A99-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
-<!--37CD013C64354C66BE23525F241A3A99-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--37CD013C64354C66BE23525F241A3A99-->  <SEQNO><![CDATA[30]]></SEQNO>
-<!--37CD013C64354C66BE23525F241A3A99-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
-<!--37CD013C64354C66BE23525F241A3A99-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
-<!--37CD013C64354C66BE23525F241A3A99-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--37CD013C64354C66BE23525F241A3A99-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
-<!--37CD013C64354C66BE23525F241A3A99-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
-<!--37CD013C64354C66BE23525F241A3A99-->  <AD_MODULE_ID><![CDATA[FF8080813129ADA401312CA1222A0005]]></AD_MODULE_ID>
-<!--37CD013C64354C66BE23525F241A3A99-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
-<!--37CD013C64354C66BE23525F241A3A99-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
-<!--37CD013C64354C66BE23525F241A3A99-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
-<!--37CD013C64354C66BE23525F241A3A99-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
-<!--37CD013C64354C66BE23525F241A3A99--></AD_FIELD>
-
-<!--53C51764570E43D8823135352C289B48--><AD_FIELD>
-<!--53C51764570E43D8823135352C289B48-->  <AD_FIELD_ID><![CDATA[53C51764570E43D8823135352C289B48]]></AD_FIELD_ID>
-<!--53C51764570E43D8823135352C289B48-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--53C51764570E43D8823135352C289B48-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--53C51764570E43D8823135352C289B48-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--53C51764570E43D8823135352C289B48-->  <NAME><![CDATA[Default]]></NAME>
-<!--53C51764570E43D8823135352C289B48-->  <DESCRIPTION><![CDATA[A value that is shown whenever a record is created.]]></DESCRIPTION>
-<!--53C51764570E43D8823135352C289B48-->  <HELP><![CDATA[The Default Checkbox indicates if this record will be used as a default value.]]></HELP>
-<!--53C51764570E43D8823135352C289B48-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--53C51764570E43D8823135352C289B48-->  <AD_TAB_ID><![CDATA[FF8080813161A3D30131620862BF0014]]></AD_TAB_ID>
-<!--53C51764570E43D8823135352C289B48-->  <AD_COLUMN_ID><![CDATA[6105AABB22794402A57BF56C1EEC325E]]></AD_COLUMN_ID>
-<!--53C51764570E43D8823135352C289B48-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
-<!--53C51764570E43D8823135352C289B48-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--53C51764570E43D8823135352C289B48-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
-<!--53C51764570E43D8823135352C289B48-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--53C51764570E43D8823135352C289B48-->  <SEQNO><![CDATA[60]]></SEQNO>
-<!--53C51764570E43D8823135352C289B48-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
-<!--53C51764570E43D8823135352C289B48-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
-<!--53C51764570E43D8823135352C289B48-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--53C51764570E43D8823135352C289B48-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
-<!--53C51764570E43D8823135352C289B48-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
-<!--53C51764570E43D8823135352C289B48-->  <AD_MODULE_ID><![CDATA[FF8080813129ADA401312CA1222A0005]]></AD_MODULE_ID>
-<!--53C51764570E43D8823135352C289B48-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
-<!--53C51764570E43D8823135352C289B48-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
-<!--53C51764570E43D8823135352C289B48-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
-<!--53C51764570E43D8823135352C289B48-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
-<!--53C51764570E43D8823135352C289B48--></AD_FIELD>
-
-<!--930F6B0AACCA4D4B8AD5ABD90990B014--><AD_FIELD>
-<!--930F6B0AACCA4D4B8AD5ABD90990B014-->  <AD_FIELD_ID><![CDATA[930F6B0AACCA4D4B8AD5ABD90990B014]]></AD_FIELD_ID>
-<!--930F6B0AACCA4D4B8AD5ABD90990B014-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--930F6B0AACCA4D4B8AD5ABD90990B014-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--930F6B0AACCA4D4B8AD5ABD90990B014-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--930F6B0AACCA4D4B8AD5ABD90990B014-->  <NAME><![CDATA[Obseig_Defaults_ID]]></NAME>
-<!--930F6B0AACCA4D4B8AD5ABD90990B014-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--930F6B0AACCA4D4B8AD5ABD90990B014-->  <AD_TAB_ID><![CDATA[FF8080813161A3D30131620862BF0014]]></AD_TAB_ID>
-<!--930F6B0AACCA4D4B8AD5ABD90990B014-->  <AD_COLUMN_ID><![CDATA[508722B3E7184516A35F5800FB807214]]></AD_COLUMN_ID>
-<!--930F6B0AACCA4D4B8AD5ABD90990B014-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
-<!--930F6B0AACCA4D4B8AD5ABD90990B014-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
-<!--930F6B0AACCA4D4B8AD5ABD90990B014-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
-<!--930F6B0AACCA4D4B8AD5ABD90990B014-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--930F6B0AACCA4D4B8AD5ABD90990B014-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
-<!--930F6B0AACCA4D4B8AD5ABD90990B014-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
-<!--930F6B0AACCA4D4B8AD5ABD90990B014-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--930F6B0AACCA4D4B8AD5ABD90990B014-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
-<!--930F6B0AACCA4D4B8AD5ABD90990B014-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
-<!--930F6B0AACCA4D4B8AD5ABD90990B014-->  <AD_MODULE_ID><![CDATA[FF8080813129ADA401312CA1222A0005]]></AD_MODULE_ID>
-<!--930F6B0AACCA4D4B8AD5ABD90990B014-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
-<!--930F6B0AACCA4D4B8AD5ABD90990B014-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
-<!--930F6B0AACCA4D4B8AD5ABD90990B014-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
-<!--930F6B0AACCA4D4B8AD5ABD90990B014-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
-<!--930F6B0AACCA4D4B8AD5ABD90990B014--></AD_FIELD>
-
-<!--A8EAC4B766534D86887CFE4EA3E808D7--><AD_FIELD>
-<!--A8EAC4B766534D86887CFE4EA3E808D7-->  <AD_FIELD_ID><![CDATA[A8EAC4B766534D86887CFE4EA3E808D7]]></AD_FIELD_ID>
-<!--A8EAC4B766534D86887CFE4EA3E808D7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--A8EAC4B766534D86887CFE4EA3E808D7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--A8EAC4B766534D86887CFE4EA3E808D7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--A8EAC4B766534D86887CFE4EA3E808D7-->  <NAME><![CDATA[New User Active]]></NAME>
-<!--A8EAC4B766534D86887CFE4EA3E808D7-->  <DESCRIPTION><![CDATA[Defines if a newly created user is active by default]]></DESCRIPTION>
-<!--A8EAC4B766534D86887CFE4EA3E808D7-->  <HELP><![CDATA[If the Google Account used to login in Openbravo doesn't have an user associated, a new user is created. A default role is defined for this user. This flag defines if the newly created user should be active by default or not.]]></HELP>
-<!--A8EAC4B766534D86887CFE4EA3E808D7-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--A8EAC4B766534D86887CFE4EA3E808D7-->  <AD_TAB_ID><![CDATA[FF8080813161A3D30131620862BF0014]]></AD_TAB_ID>
-<!--A8EAC4B766534D86887CFE4EA3E808D7-->  <AD_COLUMN_ID><![CDATA[367B51FB95134BCC9E0AB630D1763899]]></AD_COLUMN_ID>
-<!--A8EAC4B766534D86887CFE4EA3E808D7-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
-<!--A8EAC4B766534D86887CFE4EA3E808D7-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--A8EAC4B766534D86887CFE4EA3E808D7-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
-<!--A8EAC4B766534D86887CFE4EA3E808D7-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--A8EAC4B766534D86887CFE4EA3E808D7-->  <SEQNO><![CDATA[50]]></SEQNO>
-<!--A8EAC4B766534D86887CFE4EA3E808D7-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
-<!--A8EAC4B766534D86887CFE4EA3E808D7-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
-<!--A8EAC4B766534D86887CFE4EA3E808D7-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--A8EAC4B766534D86887CFE4EA3E808D7-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
-<!--A8EAC4B766534D86887CFE4EA3E808D7-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
-<!--A8EAC4B766534D86887CFE4EA3E808D7-->  <AD_MODULE_ID><![CDATA[FF8080813129ADA401312CA1222A0005]]></AD_MODULE_ID>
-<!--A8EAC4B766534D86887CFE4EA3E808D7-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
-<!--A8EAC4B766534D86887CFE4EA3E808D7-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
-<!--A8EAC4B766534D86887CFE4EA3E808D7-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
-<!--A8EAC4B766534D86887CFE4EA3E808D7-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
-<!--A8EAC4B766534D86887CFE4EA3E808D7--></AD_FIELD>
-
-<!--C79402A852F2439C8BB0C688C76E977D--><AD_FIELD>
-<!--C79402A852F2439C8BB0C688C76E977D-->  <AD_FIELD_ID><![CDATA[C79402A852F2439C8BB0C688C76E977D]]></AD_FIELD_ID>
-<!--C79402A852F2439C8BB0C688C76E977D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--C79402A852F2439C8BB0C688C76E977D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--C79402A852F2439C8BB0C688C76E977D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--C79402A852F2439C8BB0C688C76E977D-->  <NAME><![CDATA[Client]]></NAME>
-<!--C79402A852F2439C8BB0C688C76E977D-->  <DESCRIPTION><![CDATA[Client for this installation.]]></DESCRIPTION>
-<!--C79402A852F2439C8BB0C688C76E977D-->  <HELP><![CDATA[A Client is a company or a legal entity. You cannot share data between Clients.]]></HELP>
-<!--C79402A852F2439C8BB0C688C76E977D-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--C79402A852F2439C8BB0C688C76E977D-->  <AD_TAB_ID><![CDATA[FF8080813161A3D30131620862BF0014]]></AD_TAB_ID>
-<!--C79402A852F2439C8BB0C688C76E977D-->  <AD_COLUMN_ID><![CDATA[76E59140EB294155B8706CF5667A4574]]></AD_COLUMN_ID>
-<!--C79402A852F2439C8BB0C688C76E977D-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
-<!--C79402A852F2439C8BB0C688C76E977D-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
-<!--C79402A852F2439C8BB0C688C76E977D-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
-<!--C79402A852F2439C8BB0C688C76E977D-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--C79402A852F2439C8BB0C688C76E977D-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
-<!--C79402A852F2439C8BB0C688C76E977D-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
-<!--C79402A852F2439C8BB0C688C76E977D-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--C79402A852F2439C8BB0C688C76E977D-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
-<!--C79402A852F2439C8BB0C688C76E977D-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
-<!--C79402A852F2439C8BB0C688C76E977D-->  <AD_MODULE_ID><![CDATA[FF8080813129ADA401312CA1222A0005]]></AD_MODULE_ID>
-<!--C79402A852F2439C8BB0C688C76E977D-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
-<!--C79402A852F2439C8BB0C688C76E977D-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
-<!--C79402A852F2439C8BB0C688C76E977D-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
-<!--C79402A852F2439C8BB0C688C76E977D-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
-<!--C79402A852F2439C8BB0C688C76E977D--></AD_FIELD>
-
-</data>
--- a/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MENU.xml	Tue May 19 16:37:18 2015 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<data>
-<!--FF8080813151AEE1013151B119D10005--><AD_MENU>
-<!--FF8080813151AEE1013151B119D10005-->  <AD_MENU_ID><![CDATA[FF8080813151AEE1013151B119D10005]]></AD_MENU_ID>
-<!--FF8080813151AEE1013151B119D10005-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--FF8080813151AEE1013151B119D10005-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--FF8080813151AEE1013151B119D10005-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--FF8080813151AEE1013151B119D10005-->  <NAME><![CDATA[Google Account Association]]></NAME>
-<!--FF8080813151AEE1013151B119D10005-->  <DESCRIPTION><![CDATA[Process to associate a Openbravo user with a Google Account]]></DESCRIPTION>
-<!--FF8080813151AEE1013151B119D10005-->  <ISSUMMARY><![CDATA[N]]></ISSUMMARY>
-<!--FF8080813151AEE1013151B119D10005-->  <ACTION><![CDATA[OBUIAPP_OpenView]]></ACTION>
-<!--FF8080813151AEE1013151B119D10005-->  <AD_MODULE_ID><![CDATA[FF8080813129ADA401312CA1222A0005]]></AD_MODULE_ID>
-<!--FF8080813151AEE1013151B119D10005-->  <OPENLINKINBROWSER><![CDATA[N]]></OPENLINKINBROWSER>
-<!--FF8080813151AEE1013151B119D10005-->  <EM_OBUIAPP_VIEW_IMPL_ID><![CDATA[FF808081314D5BAC01314D64B9920013]]></EM_OBUIAPP_VIEW_IMPL_ID>
-<!--FF8080813151AEE1013151B119D10005--></AD_MENU>
-
-<!--FF8080813161A3D3013162164AB10038--><AD_MENU>
-<!--FF8080813161A3D3013162164AB10038-->  <AD_MENU_ID><![CDATA[FF8080813161A3D3013162164AB10038]]></AD_MENU_ID>
-<!--FF8080813161A3D3013162164AB10038-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--FF8080813161A3D3013162164AB10038-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--FF8080813161A3D3013162164AB10038-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--FF8080813161A3D3013162164AB10038-->  <NAME><![CDATA[Google Integration Preferences]]></NAME>
-<!--FF8080813161A3D3013162164AB10038-->  <DESCRIPTION><![CDATA[Setup preferences for integration with Google APIs]]></DESCRIPTION>
-<!--FF8080813161A3D3013162164AB10038-->  <ISSUMMARY><![CDATA[N]]></ISSUMMARY>
-<!--FF8080813161A3D3013162164AB10038-->  <ACTION><![CDATA[W]]></ACTION>
-<!--FF8080813161A3D3013162164AB10038-->  <AD_WINDOW_ID><![CDATA[FF8080813161A3D301316208017A0011]]></AD_WINDOW_ID>
-<!--FF8080813161A3D3013162164AB10038-->  <AD_MODULE_ID><![CDATA[FF8080813129ADA401312CA1222A0005]]></AD_MODULE_ID>
-<!--FF8080813161A3D3013162164AB10038-->  <OPENLINKINBROWSER><![CDATA[N]]></OPENLINKINBROWSER>
-<!--FF8080813161A3D3013162164AB10038--></AD_MENU>
-
-</data>
--- a/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MESSAGE.xml	Tue May 19 16:37:18 2015 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,103 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<data>
-<!--FF808081316ACC4501316ADAA4FB0006--><AD_MESSAGE>
-<!--FF808081316ACC4501316ADAA4FB0006-->  <AD_MESSAGE_ID><![CDATA[FF808081316ACC4501316ADAA4FB0006]]></AD_MESSAGE_ID>
-<!--FF808081316ACC4501316ADAA4FB0006-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--FF808081316ACC4501316ADAA4FB0006-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--FF808081316ACC4501316ADAA4FB0006-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--FF808081316ACC4501316ADAA4FB0006-->  <VALUE><![CDATA[OBSEIG_AssociateAccount]]></VALUE>
-<!--FF808081316ACC4501316ADAA4FB0006-->  <MSGTEXT><![CDATA[This process associates your Google account with your Openbravo user id. After completion, if you access the system using your Google account, you will be logged in with your currently active user.
-
-Do you want to continue?]]></MSGTEXT>
-<!--FF808081316ACC4501316ADAA4FB0006-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
-<!--FF808081316ACC4501316ADAA4FB0006-->  <AD_MODULE_ID><![CDATA[FF8080813129ADA401312CA1222A0005]]></AD_MODULE_ID>
-<!--FF808081316ACC4501316ADAA4FB0006-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
-<!--FF808081316ACC4501316ADAA4FB0006--></AD_MESSAGE>
-
-<!--FF808081318513B201318519AE3C0005--><AD_MESSAGE>
-<!--FF808081318513B201318519AE3C0005-->  <AD_MESSAGE_ID><![CDATA[FF808081318513B201318519AE3C0005]]></AD_MESSAGE_ID>
-<!--FF808081318513B201318519AE3C0005-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--FF808081318513B201318519AE3C0005-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--FF808081318513B201318519AE3C0005-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--FF808081318513B201318519AE3C0005-->  <VALUE><![CDATA[OBSEIG_SignIn]]></VALUE>
-<!--FF808081318513B201318519AE3C0005-->  <MSGTEXT><![CDATA[Sign in using:]]></MSGTEXT>
-<!--FF808081318513B201318519AE3C0005-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
-<!--FF808081318513B201318519AE3C0005-->  <AD_MODULE_ID><![CDATA[FF8080813129ADA401312CA1222A0005]]></AD_MODULE_ID>
-<!--FF808081318513B201318519AE3C0005-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
-<!--FF808081318513B201318519AE3C0005--></AD_MESSAGE>
-
-<!--FF808081318513B20131851A50FD000A--><AD_MESSAGE>
-<!--FF808081318513B20131851A50FD000A-->  <AD_MESSAGE_ID><![CDATA[FF808081318513B20131851A50FD000A]]></AD_MESSAGE_ID>
-<!--FF808081318513B20131851A50FD000A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--FF808081318513B20131851A50FD000A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--FF808081318513B20131851A50FD000A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--FF808081318513B20131851A50FD000A-->  <VALUE><![CDATA[OBSEIG_SignInAltMsg]]></VALUE>
-<!--FF808081318513B20131851A50FD000A-->  <MSGTEXT><![CDATA[Sign in using your Google Account]]></MSGTEXT>
-<!--FF808081318513B20131851A50FD000A-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
-<!--FF808081318513B20131851A50FD000A-->  <AD_MODULE_ID><![CDATA[FF8080813129ADA401312CA1222A0005]]></AD_MODULE_ID>
-<!--FF808081318513B20131851A50FD000A-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
-<!--FF808081318513B20131851A50FD000A--></AD_MESSAGE>
-
-<!--FF808081318528680131852B80EF000A--><AD_MESSAGE>
-<!--FF808081318528680131852B80EF000A-->  <AD_MESSAGE_ID><![CDATA[FF808081318528680131852B80EF000A]]></AD_MESSAGE_ID>
-<!--FF808081318528680131852B80EF000A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--FF808081318528680131852B80EF000A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--FF808081318528680131852B80EF000A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--FF808081318528680131852B80EF000A-->  <VALUE><![CDATA[OBSEIG_Activate]]></VALUE>
-<!--FF808081318528680131852B80EF000A-->  <MSGTEXT><![CDATA[<a href="http://wiki.openbravo.com/wiki/Configuration_Manual/Google_Integration" target="_blank">Log in to application using Google Account</a> is a Premium Feature]]></MSGTEXT>
-<!--FF808081318528680131852B80EF000A-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
-<!--FF808081318528680131852B80EF000A-->  <AD_MODULE_ID><![CDATA[FF8080813129ADA401312CA1222A0005]]></AD_MODULE_ID>
-<!--FF808081318528680131852B80EF000A-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
-<!--FF808081318528680131852B80EF000A--></AD_MESSAGE>
-
-<!--FF80808131862F7C0131863B5AD50006--><AD_MESSAGE>
-<!--FF80808131862F7C0131863B5AD50006-->  <AD_MESSAGE_ID><![CDATA[FF80808131862F7C0131863B5AD50006]]></AD_MESSAGE_ID>
-<!--FF80808131862F7C0131863B5AD50006-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--FF80808131862F7C0131863B5AD50006-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--FF80808131862F7C0131863B5AD50006-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--FF80808131862F7C0131863B5AD50006-->  <VALUE><![CDATA[OBSEIG_NoDefaultConf]]></VALUE>
-<!--FF80808131862F7C0131863B5AD50006-->  <MSGTEXT><![CDATA[Google Account login configuration of this instance does not allow an access to application using @@email@@. <a href="http://wiki.openbravo.com/wiki/Configuration_Manual/Google_Integration" target="_blank">Learn more</a> about it or contact this instance System Administrator for help.]]></MSGTEXT>
-<!--FF80808131862F7C0131863B5AD50006-->  <MSGTIP><![CDATA[Don't delete the @@email@@ place-holder]]></MSGTIP>
-<!--FF80808131862F7C0131863B5AD50006-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
-<!--FF80808131862F7C0131863B5AD50006-->  <AD_MODULE_ID><![CDATA[FF8080813129ADA401312CA1222A0005]]></AD_MODULE_ID>
-<!--FF80808131862F7C0131863B5AD50006-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
-<!--FF80808131862F7C0131863B5AD50006--></AD_MESSAGE>
-
-<!--FF808081318644E001318647A9A20008--><AD_MESSAGE>
-<!--FF808081318644E001318647A9A20008-->  <AD_MESSAGE_ID><![CDATA[FF808081318644E001318647A9A20008]]></AD_MESSAGE_ID>
-<!--FF808081318644E001318647A9A20008-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--FF808081318644E001318647A9A20008-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--FF808081318644E001318647A9A20008-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--FF808081318644E001318647A9A20008-->  <VALUE><![CDATA[OBSEIG_TooMuchConf]]></VALUE>
-<!--FF808081318644E001318647A9A20008-->  <MSGTEXT><![CDATA[Google Account login configuration of this instance does not allow an access to application using @@emai@l@. <a href="http://wiki.openbravo.com/wiki/Configuration_Manual/Google_Integration" target="_blank">Learn more</a> about it or contact this instance System Administrator for help.]]></MSGTEXT>
-<!--FF808081318644E001318647A9A20008-->  <MSGTIP><![CDATA[Don't delete the @@email@@ place-holder]]></MSGTIP>
-<!--FF808081318644E001318647A9A20008-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
-<!--FF808081318644E001318647A9A20008-->  <AD_MODULE_ID><![CDATA[FF8080813129ADA401312CA1222A0005]]></AD_MODULE_ID>
-<!--FF808081318644E001318647A9A20008-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
-<!--FF808081318644E001318647A9A20008--></AD_MESSAGE>
-
-<!--FF808081318644E00131864951C20011--><AD_MESSAGE>
-<!--FF808081318644E00131864951C20011-->  <AD_MESSAGE_ID><![CDATA[FF808081318644E00131864951C20011]]></AD_MESSAGE_ID>
-<!--FF808081318644E00131864951C20011-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--FF808081318644E00131864951C20011-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--FF808081318644E00131864951C20011-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--FF808081318644E00131864951C20011-->  <VALUE><![CDATA[OBSEIG_LinkedOK]]></VALUE>
-<!--FF808081318644E00131864951C20011-->  <MSGTEXT><![CDATA[Your user and Google Account have been successfully linked]]></MSGTEXT>
-<!--FF808081318644E00131864951C20011-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
-<!--FF808081318644E00131864951C20011-->  <AD_MODULE_ID><![CDATA[FF8080813129ADA401312CA1222A0005]]></AD_MODULE_ID>
-<!--FF808081318644E00131864951C20011-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
-<!--FF808081318644E00131864951C20011--></AD_MESSAGE>
-
-<!--FF8080813190BB58013190C047510009--><AD_MESSAGE>
-<!--FF8080813190BB58013190C047510009-->  <AD_MESSAGE_ID><![CDATA[FF8080813190BB58013190C047510009]]></AD_MESSAGE_ID>
-<!--FF8080813190BB58013190C047510009-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--FF8080813190BB58013190C047510009-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--FF8080813190BB58013190C047510009-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--FF8080813190BB58013190C047510009-->  <VALUE><![CDATA[OBSEIG_DuplicatedIdentifier]]></VALUE>
-<!--FF8080813190BB58013190C047510009-->  <MSGTEXT><![CDATA[This Google Account is already associated with another user. You can only associate one Google Account to one Openbravo user.]]></MSGTEXT>
-<!--FF8080813190BB58013190C047510009-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
-<!--FF8080813190BB58013190C047510009-->  <AD_MODULE_ID><![CDATA[FF8080813129ADA401312CA1222A0005]]></AD_MODULE_ID>
-<!--FF8080813190BB58013190C047510009-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
-<!--FF8080813190BB58013190C047510009--></AD_MESSAGE>
-
-</data>
--- a/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODEL_OBJECT.xml	Tue May 19 16:37:18 2015 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<data>
-<!--FF808081312DCA1801312DDE6A090004--><AD_MODEL_OBJECT>
-<!--FF808081312DCA1801312DDE6A090004-->  <AD_MODEL_OBJECT_ID><![CDATA[FF808081312DCA1801312DDE6A090004]]></AD_MODEL_OBJECT_ID>
-<!--FF808081312DCA1801312DDE6A090004-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--FF808081312DCA1801312DDE6A090004-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--FF808081312DCA1801312DDE6A090004-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--FF808081312DCA1801312DDE6A090004-->  <ACTION><![CDATA[M]]></ACTION>
-<!--FF808081312DCA1801312DDE6A090004-->  <CLASSNAME><![CDATA[org.openbravo.service.integration.google.GoogleAuthServlet]]></CLASSNAME>
-<!--FF808081312DCA1801312DDE6A090004-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
-<!--FF808081312DCA1801312DDE6A090004-->  <AD_MODULE_ID><![CDATA[FF8080813129ADA401312CA1222A0005]]></AD_MODULE_ID>
-<!--FF808081312DCA1801312DDE6A090004-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
-<!--FF808081312DCA1801312DDE6A090004-->  <NAME><![CDATA[GoogleAuthServlet]]></NAME>
-<!--FF808081312DCA1801312DDE6A090004--></AD_MODEL_OBJECT>
-
-</data>
--- a/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml	Tue May 19 16:37:18 2015 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<data>
-<!--FF808081312DCA1801312DDF0EB90007--><AD_MODEL_OBJECT_MAPPING>
-<!--FF808081312DCA1801312DDF0EB90007-->  <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[FF808081312DCA1801312DDF0EB90007]]></AD_MODEL_OBJECT_MAPPING_ID>
-<!--FF808081312DCA1801312DDF0EB90007-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--FF808081312DCA1801312DDF0EB90007-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--FF808081312DCA1801312DDF0EB90007-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--FF808081312DCA1801312DDF0EB90007-->  <AD_MODEL_OBJECT_ID><![CDATA[FF808081312DCA1801312DDE6A090004]]></AD_MODEL_OBJECT_ID>
-<!--FF808081312DCA1801312DDF0EB90007-->  <MAPPINGNAME><![CDATA[/org.openbravo.service.integration.google/auth.html]]></MAPPINGNAME>
-<!--FF808081312DCA1801312DDF0EB90007-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
-<!--FF808081312DCA1801312DDF0EB90007--></AD_MODEL_OBJECT_MAPPING>
-
-</data>
--- a/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue May 19 16:37:18 2015 +0000
+++ b/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue May 19 22:35:00 2015 +0200
@@ -1,19 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <data>
-<!--FF8080813141B198013141BA0F7D0012--><AD_MODULE_DEPENDENCY>
-<!--FF8080813141B198013141BA0F7D0012-->  <AD_MODULE_DEPENDENCY_ID><![CDATA[FF8080813141B198013141BA0F7D0012]]></AD_MODULE_DEPENDENCY_ID>
-<!--FF8080813141B198013141BA0F7D0012-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--FF8080813141B198013141BA0F7D0012-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--FF8080813141B198013141BA0F7D0012-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--FF8080813141B198013141BA0F7D0012-->  <AD_MODULE_ID><![CDATA[FF8080813129ADA401312CA1222A0005]]></AD_MODULE_ID>
-<!--FF8080813141B198013141BA0F7D0012-->  <AD_DEPENDENT_MODULE_ID><![CDATA[FF8080813141B198013141B86DD70003]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080813141B198013141BA0F7D0012-->  <STARTVERSION><![CDATA[0.1.26651]]></STARTVERSION>
-<!--FF8080813141B198013141BA0F7D0012-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
-<!--FF8080813141B198013141BA0F7D0012-->  <DEPENDANT_MODULE_NAME><![CDATA[OpenID Service Integration]]></DEPENDANT_MODULE_NAME>
-<!--FF8080813141B198013141BA0F7D0012-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
-<!--FF8080813141B198013141BA0F7D0012-->  <USER_EDITABLE_ENFORCEMENT><![CDATA[N]]></USER_EDITABLE_ENFORCEMENT>
-<!--FF8080813141B198013141BA0F7D0012--></AD_MODULE_DEPENDENCY>
-
 <!--FF8080813151AEE1013151C4ACE6001B--><AD_MODULE_DEPENDENCY>
 <!--FF8080813151AEE1013151C4ACE6001B-->  <AD_MODULE_DEPENDENCY_ID><![CDATA[FF8080813151AEE1013151C4ACE6001B]]></AD_MODULE_DEPENDENCY_ID>
 <!--FF8080813151AEE1013151C4ACE6001B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_TAB.xml	Tue May 19 16:37:18 2015 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<data>
-<!--FF8080813161A3D30131620862BF0014--><AD_TAB>
-<!--FF8080813161A3D30131620862BF0014-->  <AD_TAB_ID><![CDATA[FF8080813161A3D30131620862BF0014]]></AD_TAB_ID>
-<!--FF8080813161A3D30131620862BF0014-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--FF8080813161A3D30131620862BF0014-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--FF8080813161A3D30131620862BF0014-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--FF8080813161A3D30131620862BF0014-->  <NAME><![CDATA[Google Integration Defaults]]></NAME>
-<!--FF8080813161A3D30131620862BF0014-->  <AD_TABLE_ID><![CDATA[FF8080813161A3D301316206A5840008]]></AD_TABLE_ID>
-<!--FF8080813161A3D30131620862BF0014-->  <AD_WINDOW_ID><![CDATA[FF8080813161A3D301316208017A0011]]></AD_WINDOW_ID>
-<!--FF8080813161A3D30131620862BF0014-->  <SEQNO><![CDATA[10]]></SEQNO>
-<!--FF8080813161A3D30131620862BF0014-->  <TABLEVEL><![CDATA[0]]></TABLEVEL>
-<!--FF8080813161A3D30131620862BF0014-->  <ISSINGLEROW><![CDATA[N]]></ISSINGLEROW>
-<!--FF8080813161A3D30131620862BF0014-->  <ISINFOTAB><![CDATA[N]]></ISINFOTAB>
-<!--FF8080813161A3D30131620862BF0014-->  <ISTRANSLATIONTAB><![CDATA[N]]></ISTRANSLATIONTAB>
-<!--FF8080813161A3D30131620862BF0014-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--FF8080813161A3D30131620862BF0014-->  <HASTREE><![CDATA[N]]></HASTREE>
-<!--FF8080813161A3D30131620862BF0014-->  <PROCESSING><![CDATA[N]]></PROCESSING>
-<!--FF8080813161A3D30131620862BF0014-->  <IMPORTFIELDS><![CDATA[N]]></IMPORTFIELDS>
-<!--FF8080813161A3D30131620862BF0014-->  <ISSORTTAB><![CDATA[N]]></ISSORTTAB>
-<!--FF8080813161A3D30131620862BF0014-->  <AD_MODULE_ID><![CDATA[FF8080813129ADA401312CA1222A0005]]></AD_MODULE_ID>
-<!--FF8080813161A3D30131620862BF0014-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
-<!--FF8080813161A3D30131620862BF0014-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
-<!--FF8080813161A3D30131620862BF0014-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
-<!--FF8080813161A3D30131620862BF0014-->  <ISREADONLYTREE><![CDATA[N]]></ISREADONLYTREE>
-<!--FF8080813161A3D30131620862BF0014-->  <ISSHOWTREENODEICONS><![CDATA[Y]]></ISSHOWTREENODEICONS>
-<!--FF8080813161A3D30131620862BF0014-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
-<!--FF8080813161A3D30131620862BF0014-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
-<!--FF8080813161A3D30131620862BF0014-->  <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT>
-<!--FF8080813161A3D30131620862BF0014--></AD_TAB>
-
-</data>
--- a/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_TREENODE.xml	Tue May 19 16:37:18 2015 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<data>
-<!--3478924D8D8D4282A076A83565AFABAE--><AD_TREENODE>
-<!--3478924D8D8D4282A076A83565AFABAE-->  <AD_TREENODE_ID><![CDATA[3478924D8D8D4282A076A83565AFABAE]]></AD_TREENODE_ID>
-<!--3478924D8D8D4282A076A83565AFABAE-->  <AD_TREE_ID><![CDATA[10]]></AD_TREE_ID>
-<!--3478924D8D8D4282A076A83565AFABAE-->  <NODE_ID><![CDATA[FF8080813161A3D3013162164AB10038]]></NODE_ID>
-<!--3478924D8D8D4282A076A83565AFABAE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--3478924D8D8D4282A076A83565AFABAE-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--3478924D8D8D4282A076A83565AFABAE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--3478924D8D8D4282A076A83565AFABAE-->  <PARENT_ID><![CDATA[156]]></PARENT_ID>
-<!--3478924D8D8D4282A076A83565AFABAE-->  <SEQNO><![CDATA[70]]></SEQNO>
-<!--3478924D8D8D4282A076A83565AFABAE--></AD_TREENODE>
-
-<!--C6C17508B4344449982EF8BE76D34966--><AD_TREENODE>
-<!--C6C17508B4344449982EF8BE76D34966-->  <AD_TREENODE_ID><![CDATA[C6C17508B4344449982EF8BE76D34966]]></AD_TREENODE_ID>
-<!--C6C17508B4344449982EF8BE76D34966-->  <AD_TREE_ID><![CDATA[10]]></AD_TREE_ID>
-<!--C6C17508B4344449982EF8BE76D34966-->  <NODE_ID><![CDATA[FF8080813151AEE1013151B119D10005]]></NODE_ID>
-<!--C6C17508B4344449982EF8BE76D34966-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--C6C17508B4344449982EF8BE76D34966-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--C6C17508B4344449982EF8BE76D34966-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--C6C17508B4344449982EF8BE76D34966-->  <PARENT_ID><![CDATA[367]]></PARENT_ID>
-<!--C6C17508B4344449982EF8BE76D34966-->  <SEQNO><![CDATA[80]]></SEQNO>
-<!--C6C17508B4344449982EF8BE76D34966--></AD_TREENODE>
-
-</data>
--- a/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_WINDOW.xml	Tue May 19 16:37:18 2015 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<data>
-<!--FF8080813161A3D301316208017A0011--><AD_WINDOW>
-<!--FF8080813161A3D301316208017A0011-->  <AD_WINDOW_ID><![CDATA[FF8080813161A3D301316208017A0011]]></AD_WINDOW_ID>
-<!--FF8080813161A3D301316208017A0011-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--FF8080813161A3D301316208017A0011-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--FF8080813161A3D301316208017A0011-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--FF8080813161A3D301316208017A0011-->  <NAME><![CDATA[Google Integration Preferences]]></NAME>
-<!--FF8080813161A3D301316208017A0011-->  <DESCRIPTION><![CDATA[Setup preferences for integration with Google APIs]]></DESCRIPTION>
-<!--FF8080813161A3D301316208017A0011-->  <WINDOWTYPE><![CDATA[M]]></WINDOWTYPE>
-<!--FF8080813161A3D301316208017A0011-->  <ISSOTRX><![CDATA[Y]]></ISSOTRX>
-<!--FF8080813161A3D301316208017A0011-->  <PROCESSING><![CDATA[N]]></PROCESSING>
-<!--FF8080813161A3D301316208017A0011-->  <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
-<!--FF8080813161A3D301316208017A0011-->  <AD_MODULE_ID><![CDATA[FF8080813129ADA401312CA1222A0005]]></AD_MODULE_ID>
-<!--FF8080813161A3D301316208017A0011-->  <ISTHREADSAFE><![CDATA[N]]></ISTHREADSAFE>
-<!--FF8080813161A3D301316208017A0011-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
-<!--FF8080813161A3D301316208017A0011--></AD_WINDOW>
-
-</data>
--- a/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/OBUIAPP_MENU_PARAMETERS.xml	Tue May 19 16:37:18 2015 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<data>
-<!--FF8080813184D10A013184D641230006--><OBUIAPP_MENU_PARAMETERS>
-<!--FF8080813184D10A013184D641230006-->  <OBUIAPP_MENU_PARAMETERS_ID><![CDATA[FF8080813184D10A013184D641230006]]></OBUIAPP_MENU_PARAMETERS_ID>
-<!--FF8080813184D10A013184D641230006-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--FF8080813184D10A013184D641230006-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--FF8080813184D10A013184D641230006-->  <AD_MODULE_ID><![CDATA[FF8080813129ADA401312CA1222A0005]]></AD_MODULE_ID>
-<!--FF8080813184D10A013184D641230006-->  <AD_MENU_ID><![CDATA[FF8080813151AEE1013151B119D10005]]></AD_MENU_ID>
-<!--FF8080813184D10A013184D641230006-->  <NAME><![CDATA[showsItself]]></NAME>
-<!--FF8080813184D10A013184D641230006-->  <DESCRIPTION><![CDATA[showsItSelf]]></DESCRIPTION>
-<!--FF8080813184D10A013184D641230006-->  <PARAMETERVALUE><![CDATA[true]]></PARAMETERVALUE>
-<!--FF8080813184D10A013184D641230006-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--FF8080813184D10A013184D641230006--></OBUIAPP_MENU_PARAMETERS>
-
-<!--FF8080813184F28A013184F550410009--><OBUIAPP_MENU_PARAMETERS>
-<!--FF8080813184F28A013184F550410009-->  <OBUIAPP_MENU_PARAMETERS_ID><![CDATA[FF8080813184F28A013184F550410009]]></OBUIAPP_MENU_PARAMETERS_ID>
-<!--FF8080813184F28A013184F550410009-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--FF8080813184F28A013184F550410009-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--FF8080813184F28A013184F550410009-->  <AD_MODULE_ID><![CDATA[FF8080813129ADA401312CA1222A0005]]></AD_MODULE_ID>
-<!--FF8080813184F28A013184F550410009-->  <AD_MENU_ID><![CDATA[FF8080813151AEE1013151B119D10005]]></AD_MENU_ID>
-<!--FF8080813184F28A013184F550410009-->  <NAME><![CDATA[popup]]></NAME>
-<!--FF8080813184F28A013184F550410009-->  <DESCRIPTION><![CDATA[popup]]></DESCRIPTION>
-<!--FF8080813184F28A013184F550410009-->  <PARAMETERVALUE><![CDATA[true]]></PARAMETERVALUE>
-<!--FF8080813184F28A013184F550410009-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--FF8080813184F28A013184F550410009--></OBUIAPP_MENU_PARAMETERS>
-
-</data>
--- a/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/OBUIAPP_VIEW_IMPL.xml	Tue May 19 16:37:18 2015 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<data>
-<!--FF808081314D5BAC01314D64B9920013--><OBUIAPP_VIEW_IMPL>
-<!--FF808081314D5BAC01314D64B9920013-->  <OBUIAPP_VIEW_IMPL_ID><![CDATA[FF808081314D5BAC01314D64B9920013]]></OBUIAPP_VIEW_IMPL_ID>
-<!--FF808081314D5BAC01314D64B9920013-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--FF808081314D5BAC01314D64B9920013-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--FF808081314D5BAC01314D64B9920013-->  <AD_MODULE_ID><![CDATA[FF8080813129ADA401312CA1222A0005]]></AD_MODULE_ID>
-<!--FF808081314D5BAC01314D64B9920013-->  <NAME><![CDATA[OBSEIG_AccountAssociationView]]></NAME>
-<!--FF808081314D5BAC01314D64B9920013-->  <DESCRIPTION><![CDATA[Google Account Association]]></DESCRIPTION>
-<!--FF808081314D5BAC01314D64B9920013-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--FF808081314D5BAC01314D64B9920013-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
-<!--FF808081314D5BAC01314D64B9920013--></OBUIAPP_VIEW_IMPL>
-
-</data>
--- a/modules/org.openbravo.service.integration.google/src/org/openbravo/service/integration/google/GoogleAuthServlet.java	Tue May 19 16:37:18 2015 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,282 +0,0 @@
-/*
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
- * Version 1.1  with a permitted attribution clause; you may not  use this
- * file except in compliance with the License. You  may  obtain  a copy of
- * the License at http://www.openbravo.com/legal/license.html
- * Software distributed under the License  is  distributed  on  an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific  language  governing  rights  and  limitations
- * under the License.
- * The Original Code is Openbravo ERP.
- * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2011 Openbravo SLU
- * All Rights Reserved.
- * Contributor(s):  ______________________________________.
- ************************************************************************
- */
-package org.openbravo.service.integration.google;
-
-import java.io.IOException;
-import java.util.Map;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.log4j.Logger;
-import org.hibernate.exception.ConstraintViolationException;
-import org.openbravo.base.HttpBaseServlet;
-import org.openbravo.base.VariablesBase;
-import org.openbravo.base.exception.OBException;
-import org.openbravo.base.provider.OBProvider;
-import org.openbravo.base.secureApp.VariablesSecureApp;
-import org.openbravo.client.kernel.KernelUtils;
-import org.openbravo.dal.core.OBContext;
-import org.openbravo.dal.service.OBCriteria;
-import org.openbravo.dal.service.OBDal;
-import org.openbravo.erpCommon.obps.ActivationKey;
-import org.openbravo.erpCommon.security.SessionLogin;
-import org.openbravo.erpCommon.utility.OBError;
-import org.openbravo.erpCommon.utility.Utility;
-import org.openbravo.model.ad.access.User;
-import org.openbravo.model.ad.access.UserRoles;
-import org.openbravo.model.ad.system.Client;
-import org.openbravo.service.integration.openid.OBSOIDUserIdentifier;
-import org.openbravo.service.integration.openid.OpenIDManager;
-import org.openid4java.discovery.Identifier;
-
-/**
- * @author iperdomo
- */
-public class GoogleAuthServlet extends HttpBaseServlet {
-
-  private static final long serialVersionUID = 1L;
-
-  private static final Logger log = Logger.getLogger(GoogleAuthServlet.class);
-
-  @Override
-  protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException,
-      IOException {
-    VariablesBase vars = new VariablesBase(req);
-
-    OBContext.setAdminMode(false);
-
-    try {
-
-      String lang = OBDal.getInstance().get(Client.class, "0").getLanguage().getLanguage();
-
-      if (!ActivationKey.getInstance().isActive()) {
-        OBError error = new OBError();
-
-        String message = Utility.messageBD(this, "OBUIAPP_ActivateMessage", lang);
-        message = message.replace("%0", Utility.messageBD(this, "OBSEIG_Activate", lang));
-        message = message.replaceAll("&quot;", "\"");
-
-        error.setTitle("");
-        error.setMessage(message);
-        error.setType("Error");
-        vars.setSessionObject("LoginErrorMsg", error);
-        resp.sendRedirect(strDireccion);
-        return;
-      }
-
-      if ("true".equals(vars.getStringParameter("is_return"))) {
-        processReturn(req, resp);
-      } else {
-        if ("true".equals(vars.getStringParameter("is_association"))) {
-          vars.setSessionValue("is_association", "true");
-        }
-
-        OpenIDManager.getInstance()
-            .authRequest(OpenIDManager.GOOGLE_OPENID_DISCOVER_URL, req, resp);
-      }
-
-    } catch (Exception e) {
-      log4j.error("Error trying to authenticate using Google Auth service: " + e.getMessage(), e);
-    } finally {
-      OBContext.restorePreviousMode();
-    }
-
-  }
-
-  private void processReturn(HttpServletRequest req, HttpServletResponse resp)
-      throws ServletException, IOException {
-
-    final String loginPageURL = getServletConfig().getServletContext().getInitParameter(
-        "ServletSinIdentificar");
-
-    final VariablesSecureApp vars = new VariablesSecureApp(req);
-
-    try {
-      OBContext.setAdminMode(false);
-
-      String lang = OBDal.getInstance().get(Client.class, "0").getLanguage().getLanguage();
-
-      Identifier oid = OpenIDManager.getInstance().getIdentifier(req);
-
-      if ("true".equals(vars.getSessionValue("is_association"))) {
-        vars.removeSessionValue("is_association");
-        try {
-          OpenIDManager.getInstance().associateAccount(oid, req, resp);
-          vars.setSessionValue("startup-message", Utility.messageBD(this, "OBSEIG_LinkedOK", lang)
-              .replaceAll("&quot;", "\""));
-          vars.setSessionValue("startup-message-title", Utility.messageBD(this, "ProcessOK", lang)
-              .replaceAll("&quot;", "\""));
-
-        } catch (ConstraintViolationException e) {
-          log.error("Error trying to associate account with OpenID identifier: " + oid.toString(),
-              e);
-          // User notification
-          vars.setSessionValue(
-              "startup-message",
-              Utility.messageBD(this, "OBSEIG_DuplicatedIdentifier", lang).replaceAll("&quot;",
-                  "\""));
-          vars.setSessionValue("startup-message-title",
-              Utility.messageBD(this, "ProcessFailed", lang).replaceAll("&quot;", "\""));
-
-        }
-        resp.sendRedirect(strDireccion);
-        return;
-      }
-
-      User user = OpenIDManager.getInstance().getUser(oid);
-
-      if (user == null && oid != null) {
-        user = createUser(oid, req, resp);
-        if (user == null) {
-          return;
-        }
-      }
-
-      req.getSession(true).removeAttribute("#Authenticated_user");
-
-      if (user != null) {
-        String sessionId = createDBSession(req, user.getUsername(), user.getId());
-        req.getSession(true).setAttribute("#Authenticated_user", user.getId());
-        vars.setSessionValue("#AD_SESSION_ID", sessionId);
-        vars.setSessionValue("#LOGGINGIN", "Y");
-      }
-
-      if (Utility.isMobileBrowser(req)
-          && KernelUtils.getInstance().isModulePresent(Utility.OB_MOBILE_JAVAPACKAGE)) {
-        resp.sendRedirect("../web/org.openbravo.client.mobile/");
-      } else {
-        resp.sendRedirect(strDireccion + "/security/Menu.html");
-      }
-    } catch (Exception e) {
-      log.error("Error processing return of Google Auth Service:" + e.getMessage(), e);
-      this.getServletContext().getRequestDispatcher(loginPageURL).forward(req, resp);
-    } finally {
-      OBContext.restorePreviousMode();
-    }
-  }
-
-  @SuppressWarnings("unchecked")
-  private User createUser(Identifier oid, HttpServletRequest req, HttpServletResponse resp)
-      throws OBException, IOException {
-    Map<String, String> attributes = (Map<String, String>) req.getAttribute("attributes");
-
-    OBSEIGDefaults newUserDefaults;
-    VariablesBase vars = new VariablesBase(req);
-
-    String lang = OBDal.getInstance().get(Client.class, "0").getLanguage().getLanguage();
-
-    if (attributes.get(OpenIDManager.ATTRIBUTE_FIRSTNAME) == null
-        || attributes.get(OpenIDManager.ATTRIBUTE_LASTNAME) == null
-        || attributes.get(OpenIDManager.ATTRIBUTE_EMAIL) == null) {
-      throw new OBException("Google Integration: OpenID identifier attributes missing");
-    }
-
-    OBCriteria<OBSEIGDefaults> defaults = OBDal.getInstance().createCriteria(OBSEIGDefaults.class);
-    defaults.setFilterOnReadableClients(false);
-    defaults.setFilterOnReadableOrganization(false);
-
-    if (defaults.count() == 0) {
-      OBError error = new OBError();
-      error.setMessage(Utility.messageBD(this, "OBSEIG_NoDefaultConf", lang)
-          .replaceAll("@@email@@", attributes.get(OpenIDManager.ATTRIBUTE_EMAIL))
-          .replaceAll("&quot;", "\""));
-      error.setTitle("");
-      error.setType("Error");
-      vars.setSessionObject("LoginErrorMsg", error);
-      resp.sendRedirect(strDireccion);
-      return null;
-    }
-
-    if (defaults.count() > 1) {
-      OBError error = new OBError();
-      error.setMessage(Utility.messageBD(this, "OBSEIG_TooMuchConf", lang)
-          .replaceAll("@@email@@", attributes.get(OpenIDManager.ATTRIBUTE_EMAIL))
-          .replaceAll("&quot;", "\""));
-      error.setTitle("");
-      error.setType("Error");
-      vars.setSessionObject("LoginErrorMsg", error);
-      resp.sendRedirect(strDireccion);
-      return null;
-    }
-
-    newUserDefaults = defaults.list().get(0);
-
-    User newUser = OBProvider.getInstance().get(User.class);
-    final String name = attributes.get(OpenIDManager.ATTRIBUTE_FIRSTNAME) + " "
-        + attributes.get(OpenIDManager.ATTRIBUTE_LASTNAME);
-
-    newUser.setName(name);
-    newUser.setEmail(attributes.get(OpenIDManager.ATTRIBUTE_EMAIL));
-    newUser.setOrganization(newUserDefaults.getRole().getOrganization());
-    newUser.setClient(newUserDefaults.getRole().getClient());
-    newUser.setActive(newUserDefaults.isNewuseractive());
-    newUser.setUsername(name);
-
-    OBDal.getInstance().save(newUser);
-
-    OBSOIDUserIdentifier userIdentifier = OBProvider.getInstance().get(OBSOIDUserIdentifier.class);
-    userIdentifier.setUserContact(newUser);
-    userIdentifier.setClient(newUserDefaults.getRole().getClient());
-    userIdentifier.setOrganization(newUserDefaults.getRole().getOrganization());
-    userIdentifier.setOpenIDIdentifier(oid.toString());
-    userIdentifier.setActive(true);
-
-    OBDal.getInstance().save(userIdentifier);
-
-    UserRoles uRoles = OBProvider.getInstance().get(UserRoles.class);
-    uRoles.setClient(newUserDefaults.getRole().getClient());
-    uRoles.setOrganization(newUserDefaults.getRole().getOrganization());
-    uRoles.setUserContact(newUser);
-    uRoles.setRole(newUserDefaults.getRole());
-
-    OBDal.getInstance().save(uRoles);
-
-    newUser.setDefaultRole(newUserDefaults.getRole());
-
-    OBDal.getInstance().flush();
-
-    return newUser;
-  }
-
-  // All the methods below are a copy and modified from LoginHandler.java
-
-  private String createDBSession(HttpServletRequest req, String strUser, String strUserAuth) {
-    try {
-      String usr = strUserAuth == null ? "0" : strUserAuth;
-
-      final SessionLogin sl = new SessionLogin(req, "0", "0", usr);
-
-      if (strUserAuth == null) {
-        sl.setStatus("F");
-      } else {
-        sl.setStatus("S");
-      }
-
-      sl.setUserName(strUser);
-      sl.setServerUrl(strDireccion);
-      sl.save();
-      return sl.getSessionID();
-    } catch (Exception e) {
-      log4j.error("Error creating DB session", e);
-      return null;
-    }
-  }
-}
--- a/modules/org.openbravo.service.integration.google/src/org/openbravo/service/integration/google/GoogleIntegrationComponentProvider.java	Tue May 19 16:37:18 2015 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-/*
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
- * Version 1.1  with a permitted attribution clause; you may not  use this
- * file except in compliance with the License. You  may  obtain  a copy of
- * the License at http://www.openbravo.com/legal/license.html
- * Software distributed under the License  is  distributed  on  an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific  language  governing  rights  and  limitations
- * under the License.
- * The Original Code is Openbravo ERP.
- * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2011 Openbravo SLU
- * All Rights Reserved.
- * Contributor(s):  ______________________________________.
- ************************************************************************
- */
-package org.openbravo.service.integration.google;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import javax.enterprise.context.ApplicationScoped;
-
-import org.openbravo.client.kernel.BaseComponentProvider;
-import org.openbravo.client.kernel.Component;
-import org.openbravo.client.kernel.ComponentProvider;
-
-/**
- * @author iperdomo
- */
-@ApplicationScoped
-@ComponentProvider.Qualifier(GoogleIntegrationComponentProvider.GOOGLE_INTEGRATION_COMPONENT_TYE)
-public class GoogleIntegrationComponentProvider extends BaseComponentProvider {
-  public static final String GOOGLE_INTEGRATION_COMPONENT_TYE = "OBSEIG_GoogleComponentType";
-
-  @Override
-  public Component getComponent(String componentId, Map<String, Object> parameters) {
-    throw new IllegalArgumentException("Component id " + componentId + " not supported.");
-  }
-
-  @Override
-  public List<ComponentResource> getGlobalComponentResources() {
-    final List<ComponentResource> globalResources = new ArrayList<ComponentResource>();
-    globalResources
-        .add(createStaticResource(
-            "web/org.openbravo.service.integration.google/js/obsegi-account-association-view.js",
-            false));
-    return globalResources;
-  }
-
-  @Override
-  public List<String> getTestResources() {
-    return Collections.emptyList();
-  }
-
-}
Binary file modules/org.openbravo.service.integration.google/web/images/google.png has changed
--- a/modules/org.openbravo.service.integration.google/web/org.openbravo.service.integration.google/js/obsegi-account-association-view.js	Tue May 19 16:37:18 2015 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-/*
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
- * Version 1.1  with a permitted attribution clause; you may not  use this
- * file except in compliance with the License. You  may  obtain  a copy of
- * the License at http://www.openbravo.com/legal/license.html
- * Software distributed under the License  is  distributed  on  an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific  language  governing  rights  and  limitations
- * under the License.
- * The Original Code is Openbravo ERP.
- * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2011-2012 Openbravo SLU
- * All Rights Reserved.
- * Contributor(s):  ______________________________________.
- ************************************************************************
- */
-
-isc.defineClass('OBSEIG_AccountAssociationView', isc.Dialog);
-
-isc.OBSEIG_AccountAssociationView.addProperties({
-  showMinimizeButton: false,
-  showMaximizeButton: false,
-  autoSize: true,
-
-  isSameTab: function (viewId, params) {
-    return viewId === 'OBSEIG_AccountAssociationView';
-  },
-
-  getBookMarkParams: function () {
-    var result = {};
-    result.viewId = 'OBSEIG_AccountAssociationView';
-    return result;
-  },
-
-  OK_BUTTON: isc.addProperties({}, isc.Dialog.OK, {
-    click: function () {
-      this.topElement.cancelClick();
-      top.location.href = OB.Application.contextUrl + 'org.openbravo.service.integration.google/auth.html?is_association=true';
-    }
-  }),
-
-  initWidget: function (args) {
-    var community = (OB.Application.licenseType === 'C'),
-        label = community ? 'OBSEIG_Activate' : 'OBSEIG_AssociateAccount';
-
-    this.title = args && args.tabTitle ? args.tabTitle : '';
-
-    this.items = isc.Label.create({
-      contents: OB.I18N.getLabel(label),
-      width: '100%'
-    });
-
-    if (community) {
-      this.toolbarButtons = [isc.Dialog.OK];
-    } else {
-      this.toolbarButtons = [this.OK_BUTTON, isc.Dialog.CANCEL];
-    }
-
-    this.Super('initWidget', arguments);
-  }
-});
\ No newline at end of file
Binary file modules/org.openbravo.service.integration.openid/lib/runtime/guice-2.0.jar has changed
Binary file modules/org.openbravo.service.integration.openid/lib/runtime/httpclient-4.0.jar has changed
Binary file modules/org.openbravo.service.integration.openid/lib/runtime/httpcore-4.0.1.jar has changed
Binary file modules/org.openbravo.service.integration.openid/lib/runtime/httpmime-4.1.jar has changed
Binary file modules/org.openbravo.service.integration.openid/lib/runtime/openid4java-0.9.6.jar has changed
--- a/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_FIELD.xml	Tue May 19 16:37:18 2015 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,168 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<data>
-<!--06C3154730F64036B29CFCC083F54E7E--><AD_FIELD>
-<!--06C3154730F64036B29CFCC083F54E7E-->  <AD_FIELD_ID><![CDATA[06C3154730F64036B29CFCC083F54E7E]]></AD_FIELD_ID>
-<!--06C3154730F64036B29CFCC083F54E7E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--06C3154730F64036B29CFCC083F54E7E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--06C3154730F64036B29CFCC083F54E7E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--06C3154730F64036B29CFCC083F54E7E-->  <NAME><![CDATA[OpenID Identifier]]></NAME>
-<!--06C3154730F64036B29CFCC083F54E7E-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--06C3154730F64036B29CFCC083F54E7E-->  <AD_TAB_ID><![CDATA[FF808081314BA5A001314BA803930005]]></AD_TAB_ID>
-<!--06C3154730F64036B29CFCC083F54E7E-->  <AD_COLUMN_ID><![CDATA[73344BE692184AF98F0ACF1C11051E79]]></AD_COLUMN_ID>
-<!--06C3154730F64036B29CFCC083F54E7E-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
-<!--06C3154730F64036B29CFCC083F54E7E-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
-<!--06C3154730F64036B29CFCC083F54E7E-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
-<!--06C3154730F64036B29CFCC083F54E7E-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--06C3154730F64036B29CFCC083F54E7E-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
-<!--06C3154730F64036B29CFCC083F54E7E-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
-<!--06C3154730F64036B29CFCC083F54E7E-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--06C3154730F64036B29CFCC083F54E7E-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
-<!--06C3154730F64036B29CFCC083F54E7E-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
-<!--06C3154730F64036B29CFCC083F54E7E-->  <AD_MODULE_ID><![CDATA[FF8080813141B198013141B86DD70003]]></AD_MODULE_ID>
-<!--06C3154730F64036B29CFCC083F54E7E-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
-<!--06C3154730F64036B29CFCC083F54E7E-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
-<!--06C3154730F64036B29CFCC083F54E7E-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
-<!--06C3154730F64036B29CFCC083F54E7E-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
-<!--06C3154730F64036B29CFCC083F54E7E--></AD_FIELD>
-
-<!--32B045DD0DFC4D7D813B0EADB947E496--><AD_FIELD>
-<!--32B045DD0DFC4D7D813B0EADB947E496-->  <AD_FIELD_ID><![CDATA[32B045DD0DFC4D7D813B0EADB947E496]]></AD_FIELD_ID>
-<!--32B045DD0DFC4D7D813B0EADB947E496-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--32B045DD0DFC4D7D813B0EADB947E496-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--32B045DD0DFC4D7D813B0EADB947E496-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--32B045DD0DFC4D7D813B0EADB947E496-->  <NAME><![CDATA[Organization]]></NAME>
-<!--32B045DD0DFC4D7D813B0EADB947E496-->  <DESCRIPTION><![CDATA[Organizational entity within client]]></DESCRIPTION>
-<!--32B045DD0DFC4D7D813B0EADB947E496-->  <HELP><![CDATA[An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.]]></HELP>
-<!--32B045DD0DFC4D7D813B0EADB947E496-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--32B045DD0DFC4D7D813B0EADB947E496-->  <AD_TAB_ID><![CDATA[FF808081314BA5A001314BA803930005]]></AD_TAB_ID>
-<!--32B045DD0DFC4D7D813B0EADB947E496-->  <AD_COLUMN_ID><![CDATA[2F7C8DD6C697415ABA1B3EE701BC2C4A]]></AD_COLUMN_ID>
-<!--32B045DD0DFC4D7D813B0EADB947E496-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
-<!--32B045DD0DFC4D7D813B0EADB947E496-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--32B045DD0DFC4D7D813B0EADB947E496-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
-<!--32B045DD0DFC4D7D813B0EADB947E496-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--32B045DD0DFC4D7D813B0EADB947E496-->  <SEQNO><![CDATA[10]]></SEQNO>
-<!--32B045DD0DFC4D7D813B0EADB947E496-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
-<!--32B045DD0DFC4D7D813B0EADB947E496-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
-<!--32B045DD0DFC4D7D813B0EADB947E496-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--32B045DD0DFC4D7D813B0EADB947E496-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
-<!--32B045DD0DFC4D7D813B0EADB947E496-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
-<!--32B045DD0DFC4D7D813B0EADB947E496-->  <AD_MODULE_ID><![CDATA[FF8080813141B198013141B86DD70003]]></AD_MODULE_ID>
-<!--32B045DD0DFC4D7D813B0EADB947E496-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
-<!--32B045DD0DFC4D7D813B0EADB947E496-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
-<!--32B045DD0DFC4D7D813B0EADB947E496-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
-<!--32B045DD0DFC4D7D813B0EADB947E496-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
-<!--32B045DD0DFC4D7D813B0EADB947E496--></AD_FIELD>
-
-<!--34D7279AFB294666A568470B7257F94E--><AD_FIELD>
-<!--34D7279AFB294666A568470B7257F94E-->  <AD_FIELD_ID><![CDATA[34D7279AFB294666A568470B7257F94E]]></AD_FIELD_ID>
-<!--34D7279AFB294666A568470B7257F94E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--34D7279AFB294666A568470B7257F94E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--34D7279AFB294666A568470B7257F94E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--34D7279AFB294666A568470B7257F94E-->  <NAME><![CDATA[Client]]></NAME>
-<!--34D7279AFB294666A568470B7257F94E-->  <DESCRIPTION><![CDATA[Client for this installation.]]></DESCRIPTION>
-<!--34D7279AFB294666A568470B7257F94E-->  <HELP><![CDATA[A Client is a company or a legal entity. You cannot share data between Clients.]]></HELP>
-<!--34D7279AFB294666A568470B7257F94E-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--34D7279AFB294666A568470B7257F94E-->  <AD_TAB_ID><![CDATA[FF808081314BA5A001314BA803930005]]></AD_TAB_ID>
-<!--34D7279AFB294666A568470B7257F94E-->  <AD_COLUMN_ID><![CDATA[575115249FD0451AA66D6AEE49978E7C]]></AD_COLUMN_ID>
-<!--34D7279AFB294666A568470B7257F94E-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
-<!--34D7279AFB294666A568470B7257F94E-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
-<!--34D7279AFB294666A568470B7257F94E-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
-<!--34D7279AFB294666A568470B7257F94E-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--34D7279AFB294666A568470B7257F94E-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
-<!--34D7279AFB294666A568470B7257F94E-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
-<!--34D7279AFB294666A568470B7257F94E-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--34D7279AFB294666A568470B7257F94E-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
-<!--34D7279AFB294666A568470B7257F94E-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
-<!--34D7279AFB294666A568470B7257F94E-->  <AD_MODULE_ID><![CDATA[FF8080813141B198013141B86DD70003]]></AD_MODULE_ID>
-<!--34D7279AFB294666A568470B7257F94E-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
-<!--34D7279AFB294666A568470B7257F94E-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
-<!--34D7279AFB294666A568470B7257F94E-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
-<!--34D7279AFB294666A568470B7257F94E-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
-<!--34D7279AFB294666A568470B7257F94E--></AD_FIELD>
-
-<!--44DE96A0EB544FAAA7A641B5CAD7024D--><AD_FIELD>
-<!--44DE96A0EB544FAAA7A641B5CAD7024D-->  <AD_FIELD_ID><![CDATA[44DE96A0EB544FAAA7A641B5CAD7024D]]></AD_FIELD_ID>
-<!--44DE96A0EB544FAAA7A641B5CAD7024D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--44DE96A0EB544FAAA7A641B5CAD7024D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--44DE96A0EB544FAAA7A641B5CAD7024D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--44DE96A0EB544FAAA7A641B5CAD7024D-->  <NAME><![CDATA[Active]]></NAME>
-<!--44DE96A0EB544FAAA7A641B5CAD7024D-->  <DESCRIPTION><![CDATA[A flag indicating whether this record is available for use or de-activated.]]></DESCRIPTION>
-<!--44DE96A0EB544FAAA7A641B5CAD7024D-->  <HELP><![CDATA[There are two methods of making records unavailable in the system: One is to delete the record, the other is to de-activate the record. A de-activated record is not available for selection, but available for reporting. There are two reasons for de-activating and not deleting records: 
-(1) The system requires the record for auditing purposes.
-(2) The record is referenced by other records. E.g., you cannot delete a Business Partner, if there are existing invoices for it. By de-activating the Business Partner you prevent it from being used in future transactions.]]></HELP>
-<!--44DE96A0EB544FAAA7A641B5CAD7024D-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--44DE96A0EB544FAAA7A641B5CAD7024D-->  <AD_TAB_ID><![CDATA[FF808081314BA5A001314BA803930005]]></AD_TAB_ID>
-<!--44DE96A0EB544FAAA7A641B5CAD7024D-->  <AD_COLUMN_ID><![CDATA[F86B06B218BD4196B3D468A8A3A8F865]]></AD_COLUMN_ID>
-<!--44DE96A0EB544FAAA7A641B5CAD7024D-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
-<!--44DE96A0EB544FAAA7A641B5CAD7024D-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--44DE96A0EB544FAAA7A641B5CAD7024D-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
-<!--44DE96A0EB544FAAA7A641B5CAD7024D-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--44DE96A0EB544FAAA7A641B5CAD7024D-->  <SEQNO><![CDATA[30]]></SEQNO>
-<!--44DE96A0EB544FAAA7A641B5CAD7024D-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
-<!--44DE96A0EB544FAAA7A641B5CAD7024D-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
-<!--44DE96A0EB544FAAA7A641B5CAD7024D-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--44DE96A0EB544FAAA7A641B5CAD7024D-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
-<!--44DE96A0EB544FAAA7A641B5CAD7024D-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
-<!--44DE96A0EB544FAAA7A641B5CAD7024D-->  <AD_MODULE_ID><![CDATA[FF8080813141B198013141B86DD70003]]></AD_MODULE_ID>
-<!--44DE96A0EB544FAAA7A641B5CAD7024D-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
-<!--44DE96A0EB544FAAA7A641B5CAD7024D-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
-<!--44DE96A0EB544FAAA7A641B5CAD7024D-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
-<!--44DE96A0EB544FAAA7A641B5CAD7024D-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
-<!--44DE96A0EB544FAAA7A641B5CAD7024D--></AD_FIELD>
-
-<!--9339017A118E41D2B39AFE98068732C7--><AD_FIELD>
-<!--9339017A118E41D2B39AFE98068732C7-->  <AD_FIELD_ID><![CDATA[9339017A118E41D2B39AFE98068732C7]]></AD_FIELD_ID>
-<!--9339017A118E41D2B39AFE98068732C7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--9339017A118E41D2B39AFE98068732C7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--9339017A118E41D2B39AFE98068732C7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--9339017A118E41D2B39AFE98068732C7-->  <NAME><![CDATA[User/Contact]]></NAME>
-<!--9339017A118E41D2B39AFE98068732C7-->  <DESCRIPTION><![CDATA[An acquaintance to reach for information related to the business partner.]]></DESCRIPTION>
-<!--9339017A118E41D2B39AFE98068732C7-->  <HELP><![CDATA[The User identifies a unique user in the system. This could be an internal user or a business partner contact]]></HELP>
-<!--9339017A118E41D2B39AFE98068732C7-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--9339017A118E41D2B39AFE98068732C7-->  <AD_TAB_ID><![CDATA[FF808081314BA5A001314BA803930005]]></AD_TAB_ID>
-<!--9339017A118E41D2B39AFE98068732C7-->  <AD_COLUMN_ID><![CDATA[A8FD2025FA244939B687F49907BE94C5]]></AD_COLUMN_ID>
-<!--9339017A118E41D2B39AFE98068732C7-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
-<!--9339017A118E41D2B39AFE98068732C7-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--9339017A118E41D2B39AFE98068732C7-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
-<!--9339017A118E41D2B39AFE98068732C7-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--9339017A118E41D2B39AFE98068732C7-->  <SEQNO><![CDATA[40]]></SEQNO>
-<!--9339017A118E41D2B39AFE98068732C7-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
-<!--9339017A118E41D2B39AFE98068732C7-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
-<!--9339017A118E41D2B39AFE98068732C7-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--9339017A118E41D2B39AFE98068732C7-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
-<!--9339017A118E41D2B39AFE98068732C7-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
-<!--9339017A118E41D2B39AFE98068732C7-->  <AD_MODULE_ID><![CDATA[FF8080813141B198013141B86DD70003]]></AD_MODULE_ID>
-<!--9339017A118E41D2B39AFE98068732C7-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
-<!--9339017A118E41D2B39AFE98068732C7-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
-<!--9339017A118E41D2B39AFE98068732C7-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
-<!--9339017A118E41D2B39AFE98068732C7-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
-<!--9339017A118E41D2B39AFE98068732C7--></AD_FIELD>
-
-<!--BB27460CAB754EADA0B16977399C1334--><AD_FIELD>
-<!--BB27460CAB754EADA0B16977399C1334-->  <AD_FIELD_ID><![CDATA[BB27460CAB754EADA0B16977399C1334]]></AD_FIELD_ID>
-<!--BB27460CAB754EADA0B16977399C1334-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--BB27460CAB754EADA0B16977399C1334-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--BB27460CAB754EADA0B16977399C1334-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--BB27460CAB754EADA0B16977399C1334-->  <NAME><![CDATA[OpenID Identifier]]></NAME>
-<!--BB27460CAB754EADA0B16977399C1334-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--BB27460CAB754EADA0B16977399C1334-->  <AD_TAB_ID><![CDATA[FF808081314BA5A001314BA803930005]]></AD_TAB_ID>
-<!--BB27460CAB754EADA0B16977399C1334-->  <AD_COLUMN_ID><![CDATA[31878640A2FE4C128F50DF1A4CE42C66]]></AD_COLUMN_ID>
-<!--BB27460CAB754EADA0B16977399C1334-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
-<!--BB27460CAB754EADA0B16977399C1334-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--BB27460CAB754EADA0B16977399C1334-->  <DISPLAYLENGTH><![CDATA[255]]></DISPLAYLENGTH>
-<!--BB27460CAB754EADA0B16977399C1334-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--BB27460CAB754EADA0B16977399C1334-->  <SEQNO><![CDATA[50]]></SEQNO>
-<!--BB27460CAB754EADA0B16977399C1334-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
-<!--BB27460CAB754EADA0B16977399C1334-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
-<!--BB27460CAB754EADA0B16977399C1334-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--BB27460CAB754EADA0B16977399C1334-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
-<!--BB27460CAB754EADA0B16977399C1334-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
-<!--BB27460CAB754EADA0B16977399C1334-->  <AD_MODULE_ID><![CDATA[FF8080813141B198013141B86DD70003]]></AD_MODULE_ID>
-<!--BB27460CAB754EADA0B16977399C1334-->  <GRID_SEQNO><![CDATA[10]]></GRID_SEQNO>
-<!--BB27460CAB754EADA0B16977399C1334-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
-<!--BB27460CAB754EADA0B16977399C1334-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
-<!--BB27460CAB754EADA0B16977399C1334-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
-<!--BB27460CAB754EADA0B16977399C1334-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
-<!--BB27460CAB754EADA0B16977399C1334--></AD_FIELD>
-
-</data>
--- a/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_TAB.xml	Tue May 19 16:37:18 2015 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<data>
-<!--FF808081314BA5A001314BA803930005--><AD_TAB>
-<!--FF808081314BA5A001314BA803930005-->  <AD_TAB_ID><![CDATA[FF808081314BA5A001314BA803930005]]></AD_TAB_ID>
-<!--FF808081314BA5A001314BA803930005-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--FF808081314BA5A001314BA803930005-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--FF808081314BA5A001314BA803930005-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--FF808081314BA5A001314BA803930005-->  <NAME><![CDATA[OpenID Identifier]]></NAME>
-<!--FF808081314BA5A001314BA803930005-->  <AD_TABLE_ID><![CDATA[FF808081314B80C001314B976A49000C]]></AD_TABLE_ID>
-<!--FF808081314BA5A001314BA803930005-->  <AD_WINDOW_ID><![CDATA[108]]></AD_WINDOW_ID>
-<!--FF808081314BA5A001314BA803930005-->  <SEQNO><![CDATA[30]]></SEQNO>
-<!--FF808081314BA5A001314BA803930005-->  <TABLEVEL><![CDATA[1]]></TABLEVEL>
-<!--FF808081314BA5A001314BA803930005-->  <ISSINGLEROW><![CDATA[N]]></ISSINGLEROW>
-<!--FF808081314BA5A001314BA803930005-->  <ISINFOTAB><![CDATA[N]]></ISINFOTAB>
-<!--FF808081314BA5A001314BA803930005-->  <ISTRANSLATIONTAB><![CDATA[N]]></ISTRANSLATIONTAB>
-<!--FF808081314BA5A001314BA803930005-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--FF808081314BA5A001314BA803930005-->  <HASTREE><![CDATA[N]]></HASTREE>
-<!--FF808081314BA5A001314BA803930005-->  <PROCESSING><![CDATA[N]]></PROCESSING>
-<!--FF808081314BA5A001314BA803930005-->  <IMPORTFIELDS><![CDATA[N]]></IMPORTFIELDS>
-<!--FF808081314BA5A001314BA803930005-->  <ISSORTTAB><![CDATA[N]]></ISSORTTAB>
-<!--FF808081314BA5A001314BA803930005-->  <AD_MODULE_ID><![CDATA[FF8080813141B198013141B86DD70003]]></AD_MODULE_ID>
-<!--FF808081314BA5A001314BA803930005-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
-<!--FF808081314BA5A001314BA803930005-->  <SHOWPARENTBUTTONS><![CDATA[N]]></SHOWPARENTBUTTONS>
-<!--FF808081314BA5A001314BA803930005-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
-<!--FF808081314BA5A001314BA803930005-->  <ISREADONLYTREE><![CDATA[N]]></ISREADONLYTREE>
-<!--FF808081314BA5A001314BA803930005-->  <ISSHOWTREENODEICONS><![CDATA[Y]]></ISSHOWTREENODEICONS>
-<!--FF808081314BA5A001314BA803930005-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
-<!--FF808081314BA5A001314BA803930005-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
-<!--FF808081314BA5A001314BA803930005-->  <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT>
-<!--FF808081314BA5A001314BA803930005--></AD_TAB>
-
-</data>
--- a/modules/org.openbravo.service.integration.openid/src/org/openbravo/service/integration/openid/OpenIDManager.java	Tue May 19 16:37:18 2015 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,255 +0,0 @@
-/*
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
- * Version 1.1  with a permitted attribution clause; you may not  use this
- * file except in compliance with the License. You  may  obtain  a copy of
- * the License at http://www.openbravo.com/legal/license.html
- * Software distributed under the License  is  distributed  on  an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific  language  governing  rights  and  limitations
- * under the License.
- * The Original Code is Openbravo ERP.
- * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2011 Openbravo SLU
- * All Rights Reserved.
- * Contributor(s):  ______________________________________.
- ************************************************************************
- */
-package org.openbravo.service.integration.openid;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
-import org.hibernate.criterion.Restrictions;
-import org.openbravo.base.exception.OBException;
-import org.openbravo.base.provider.OBProvider;
-import org.openbravo.base.provider.OBSingleton;
-import org.openbravo.dal.core.OBContext;
-import org.openbravo.dal.service.OBCriteria;
-import org.openbravo.dal.service.OBDal;
-import org.openbravo.model.ad.access.User;
-import org.openid4java.OpenIDException;
-import org.openid4java.association.AssociationSessionType;
-import org.openid4java.consumer.ConsumerManager;
-import org.openid4java.consumer.InMemoryConsumerAssociationStore;
-import org.openid4java.consumer.InMemoryNonceVerifier;
-import org.openid4java.consumer.VerificationResult;
-import org.openid4java.discovery.DiscoveryInformation;
-import org.openid4java.discovery.Identifier;
-import org.openid4java.message.AuthRequest;
-import org.openid4java.message.AuthSuccess;
-import org.openid4java.message.MessageException;
-import org.openid4java.message.ParameterList;
-import org.openid4java.message.ax.AxMessage;
-import org.openid4java.message.ax.FetchRequest;
-import org.openid4java.message.ax.FetchResponse;
-
-/**
- * 
- * @author iperdomo
- */
-@SuppressWarnings("rawtypes")
-public class OpenIDManager implements OBSingleton {
-
-  private static ConsumerManager manager;
-  private static OpenIDManager instance;
-
-  private static final Logger log = Logger.getLogger(OpenIDManager.class);
-
-  private static Map<String, DiscoveryInformation> discoveryInformationMap;
-
-  public static final String ATTRIBUTE_EMAIL = "email";
-  public static final String ATTRIBUTE_FIRSTNAME = "firstName";
-  public static final String ATTRIBUTE_LASTNAME = "lastName";
-
-  public static final String GOOGLE_OPENID_DISCOVER_URL = "https://www.google.com/accounts/o8/id";
-
-  public static synchronized OpenIDManager getInstance() {
-    if (instance == null) {
-      instance = OBProvider.getInstance().get(OpenIDManager.class);
-      discoveryInformationMap = new HashMap<String, DiscoveryInformation>();
-      manager = new ConsumerManager();
-      manager.setAssociations(new InMemoryConsumerAssociationStore());
-      manager.setNonceVerifier(new InMemoryNonceVerifier(5000));
-      manager.setMinAssocSessEnc(AssociationSessionType.DH_SHA256);
-    }
-    return instance;
-  }
-
-  public String authRequest(String discoverURL, HttpServletRequest httpReq,
-      HttpServletResponse httpResp) throws IOException, ServletException {
-    try {
-      // configure the return_to URL where your application will receive
-      // the authentication responses from the OpenID provider
-      // String returnToUrl = "http://example.com/openid";
-      String returnToUrl = httpReq.getRequestURL().toString() + "?is_return=true";
-
-      DiscoveryInformation discovered;
-      if (discoveryInformationMap.containsKey(discoverURL)) {
-        discovered = discoveryInformationMap.get(discoverURL);
-      } else {
-        // perform discovery on the user-supplied identifier
-        List discoveries = manager.discover(discoverURL);
-
-        // attempt to associate with the OpenID provider
-        // and retrieve one service endpoint for authentication
-        discovered = manager.associate(discoveries);
-
-        discoveryInformationMap.put(discoverURL, discovered);
-      }
-
-      // store the discovery information in the user's session
-      httpReq.getSession().setAttribute("openid-disc", discovered);
-
-      // obtain a AuthRequest message to be sent to the OpenID provider
-      AuthRequest authReq = manager.authenticate(discovered, returnToUrl);
-
-      FetchRequest fetch = FetchRequest.createFetchRequest();
-      fetch.addAttribute(ATTRIBUTE_EMAIL, "http://axschema.org/contact/email", true);
-      fetch.addAttribute(ATTRIBUTE_FIRSTNAME, "http://axschema.org/namePerson/first", true);
-      fetch.addAttribute(ATTRIBUTE_LASTNAME, "http://axschema.org/namePerson/last", true);
-
-      authReq.addExtension(fetch);
-
-      httpReq.setAttribute("message", authReq);
-
-      httpResp.sendRedirect(authReq.getDestinationUrl(true));
-    } catch (OpenIDException e) {
-      log.error("Error trying to authenticate with Google Services: " + e.getMessage(), e);
-      httpResp.sendRedirect(httpReq.getHeader("Referer"));
-    }
-
-    return null;
-  }
-
-  public User getUser(Identifier oid) throws OBException {
-    User u = null;
-
-    if (oid == null) {
-      log.error("No user has been associated with the Google account");
-      return null;
-    }
-
-    OBCriteria<OBSOIDUserIdentifier> userCriteria = OBDal.getInstance().createCriteria(
-        OBSOIDUserIdentifier.class);
-    userCriteria
-        .add(Restrictions.eq(OBSOIDUserIdentifier.PROPERTY_OPENIDIDENTIFIER, oid.toString()));
-    userCriteria.setFilterOnReadableClients(false);
-    userCriteria.setFilterOnReadableOrganization(false);
-
-    OBSOIDUserIdentifier userIdentifier = (OBSOIDUserIdentifier) userCriteria.uniqueResult();
-    if (userIdentifier != null) {
-      u = userIdentifier.getUserContact();
-    }
-    return u;
-
-  }
-
-  public void associateAccount(Identifier oid, HttpServletRequest req, HttpServletResponse resp)
-      throws Exception {
-    // Map<String, String> userAttributes = (LinkedHashMap<String, String>) req
-    // .getAttribute("attributes");
-
-    User user = OBDal.getInstance().get(User.class, OBContext.getOBContext().getUser().getId());
-    // TODO: Ask the user if he wants to update the email account and uncomment this code
-    // if (!userAttributes.get(ATTRIBUTE_EMAIL).equals(user.getEmail())) {
-    // try {
-    // user.setEmail(userAttributes.get(ATTRIBUTE_EMAIL));
-    // OBDal.getInstance().save(user);
-    // OBDal.getInstance().flush();
-    // } catch (Exception e) {
-    // log.error("Error trying to update email for user: " + user.getUsername(), e);
-    // }
-    // }
-
-    OBCriteria<OBSOIDUserIdentifier> oidCriteria = OBDal.getInstance().createCriteria(
-        OBSOIDUserIdentifier.class);
-    oidCriteria
-        .add(Restrictions.eq(OBSOIDUserIdentifier.PROPERTY_OPENIDIDENTIFIER, oid.toString()));
-
-    if (oidCriteria.count() > 0) {
-      log.warn("Account association already exists - OpenID identifier: " + oid.toString());
-      return;
-    }
-
-    OBSOIDUserIdentifier userIdentifier = OBProvider.getInstance().get(OBSOIDUserIdentifier.class);
-    userIdentifier.setUserContact(user);
-    userIdentifier.setOpenIDIdentifier(oid.toString());
-    userIdentifier.setClient(OBContext.getOBContext().getRole().getClient());
-    userIdentifier.setOrganization(OBContext.getOBContext().getRole().getOrganization());
-
-    OBDal.getInstance().save(userIdentifier);
-    OBDal.getInstance().flush();
-  }
-
-  public Identifier getIdentifier(HttpServletRequest httpReq) throws OBException {
-    try {
-      // extract the parameters from the authentication response
-      // (which comes in as a HTTP request from the OpenID provider)
-      ParameterList response = new ParameterList(httpReq.getParameterMap());
-
-      // retrieve the previously stored discovery information
-      DiscoveryInformation discovered = (DiscoveryInformation) httpReq.getSession().getAttribute(
-          "openid-disc");
-
-      // extract the receiving URL from the HTTP request
-      StringBuffer receivingURL = httpReq.getRequestURL();
-      String queryString = httpReq.getQueryString();
-      if (queryString != null && queryString.length() > 0)
-        receivingURL.append("?").append(httpReq.getQueryString());
-
-      // verify the response; ConsumerManager needs to be the same
-      // (static) instance used to place the authentication request
-      VerificationResult verification = manager.verify(receivingURL.toString(), response,
-          discovered);
-
-      // examine the verification result and extract the verified
-      // identifier
-      Identifier verified = verification.getVerifiedId();
-      if (verified != null) {
-        AuthSuccess authSuccess = (AuthSuccess) verification.getAuthResponse();
-
-        receiveAttributeExchange(httpReq, authSuccess);
-
-        return verified; // success
-      }
-    } catch (OpenIDException e) {
-      // present error to the user
-      throw new OBException(e);
-    }
-
-    return null;
-  }
-
-  @SuppressWarnings({ "unchecked" })
-  private void receiveAttributeExchange(HttpServletRequest httpReq, AuthSuccess authSuccess)
-      throws MessageException {
-    if (authSuccess.hasExtension(AxMessage.OPENID_NS_AX)) {
-      FetchResponse fetchResp = (FetchResponse) authSuccess.getExtension(AxMessage.OPENID_NS_AX);
-
-      List aliases = fetchResp.getAttributeAliases();
-      Map attributes = new LinkedHashMap();
-      for (Iterator iter = aliases.iterator(); iter.hasNext();) {
-        String alias = (String) iter.next();
-        List values = fetchResp.getAttributeValues(alias);
-        if (values.size() > 0) {
-          String[] arr = new String[values.size()];
-          values.toArray(arr);
-          attributes.put(alias, StringUtils.join(arr));
-        }
-      }
-      httpReq.setAttribute("attributes", attributes);
-    }
-  }
-}
--- a/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue May 19 16:37:18 2015 +0000
+++ b/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue May 19 22:35:00 2015 +0200
@@ -98,34 +98,6 @@
 <!--FEF6E40F244A4061B7C62CB755663712-->  <USER_EDITABLE_ENFORCEMENT><![CDATA[N]]></USER_EDITABLE_ENFORCEMENT>
 <!--FEF6E40F244A4061B7C62CB755663712--></AD_MODULE_DEPENDENCY>
 
-<!--FF8080813189932B013189B45B59003A--><AD_MODULE_DEPENDENCY>
-<!--FF8080813189932B013189B45B59003A-->  <AD_MODULE_DEPENDENCY_ID><![CDATA[FF8080813189932B013189B45B59003A]]></AD_MODULE_DEPENDENCY_ID>
-<!--FF8080813189932B013189B45B59003A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--FF8080813189932B013189B45B59003A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--FF8080813189932B013189B45B59003A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--FF8080813189932B013189B45B59003A-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
-<!--FF8080813189932B013189B45B59003A-->  <AD_DEPENDENT_MODULE_ID><![CDATA[FF8080813141B198013141B86DD70003]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080813189932B013189B45B59003A-->  <STARTVERSION><![CDATA[0.1.26651]]></STARTVERSION>
-<!--FF8080813189932B013189B45B59003A-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
-<!--FF8080813189932B013189B45B59003A-->  <DEPENDANT_MODULE_NAME><![CDATA[OpenID Service Integration]]></DEPENDANT_MODULE_NAME>
-<!--FF8080813189932B013189B45B59003A-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
-<!--FF8080813189932B013189B45B59003A-->  <USER_EDITABLE_ENFORCEMENT><![CDATA[N]]></USER_EDITABLE_ENFORCEMENT>
-<!--FF8080813189932B013189B45B59003A--></AD_MODULE_DEPENDENCY>
-
-<!--FF8080813189932B013189B4C00F003D--><AD_MODULE_DEPENDENCY>
-<!--FF8080813189932B013189B4C00F003D-->  <AD_MODULE_DEPENDENCY_ID><![CDATA[FF8080813189932B013189B4C00F003D]]></AD_MODULE_DEPENDENCY_ID>
-<!--FF8080813189932B013189B4C00F003D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--FF8080813189932B013189B4C00F003D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--FF8080813189932B013189B4C00F003D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--FF8080813189932B013189B4C00F003D-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
-<!--FF8080813189932B013189B4C00F003D-->  <AD_DEPENDENT_MODULE_ID><![CDATA[FF8080813129ADA401312CA1222A0005]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080813189932B013189B4C00F003D-->  <STARTVERSION><![CDATA[0.1.26651]]></STARTVERSION>
-<!--FF8080813189932B013189B4C00F003D-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
-<!--FF8080813189932B013189B4C00F003D-->  <DEPENDANT_MODULE_NAME><![CDATA[Integration with Google APIs]]></DEPENDANT_MODULE_NAME>
-<!--FF8080813189932B013189B4C00F003D-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
-<!--FF8080813189932B013189B4C00F003D-->  <USER_EDITABLE_ENFORCEMENT><![CDATA[N]]></USER_EDITABLE_ENFORCEMENT>
-<!--FF8080813189932B013189B4C00F003D--></AD_MODULE_DEPENDENCY>
-
 <!--FF8081812E2F6F3C012E2F750109001C--><AD_MODULE_DEPENDENCY>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <AD_MODULE_DEPENDENCY_ID><![CDATA[FF8081812E2F6F3C012E2F750109001C]]></AD_MODULE_DEPENDENCY_ID>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/referencedata/sampledata/F_B_International_Group/AD_WINDOW_ACCESS.xml	Tue May 19 16:37:18 2015 +0000
+++ b/referencedata/sampledata/F_B_International_Group/AD_WINDOW_ACCESS.xml	Tue May 19 22:35:00 2015 +0200
@@ -2227,20 +2227,6 @@
 </AD_WINDOW_ACCESS>
 
 <AD_WINDOW_ACCESS>
-  <AD_WINDOW_ACCESS_ID><![CDATA[141DF565932C45A497FC54235429A02A]]></AD_WINDOW_ACCESS_ID>
-  <AD_WINDOW_ID><![CDATA[FF8080813161A3D301316208017A0011]]></AD_WINDOW_ID>
-  <AD_ROLE_ID><![CDATA[0D4689364DDB473BB3023E4E554C8762]]></AD_ROLE_ID>
-  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
-  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-  <CREATED><![CDATA[2013-07-04 23:45:47.842]]></CREATED>
-  <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:45:47.842]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
-  <ISREADWRITE><![CDATA[Y]]></ISREADWRITE>
-</AD_WINDOW_ACCESS>
-
-<AD_WINDOW_ACCESS>
   <AD_WINDOW_ACCESS_ID><![CDATA[1426809B6A42477EA4536C058F02B5A5]]></AD_WINDOW_ACCESS_ID>
   <AD_WINDOW_ID><![CDATA[107]]></AD_WINDOW_ID>
   <AD_ROLE_ID><![CDATA[F3196A30B53A42778727B2852FF90C24]]></AD_ROLE_ID>
@@ -6049,34 +6035,6 @@
 </AD_WINDOW_ACCESS>
 
 <AD_WINDOW_ACCESS>
-  <AD_WINDOW_ACCESS_ID><![CDATA[39F10E93329A4C72B5A3DC94CCC776BD]]></AD_WINDOW_ACCESS_ID>
-  <AD_WINDOW_ID><![CDATA[FF8080813161A3D301316208017A0011]]></AD_WINDOW_ID>
-  <AD_ROLE_ID><![CDATA[E669860946664B24BD1AE1ACDF2F5FC3]]></AD_ROLE_ID>
-  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
-  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-  <CREATED><![CDATA[2013-07-04 23:45:47.829]]></CREATED>
-  <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:45:47.829]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
-  <ISREADWRITE><![CDATA[Y]]></ISREADWRITE>
-</AD_WINDOW_ACCESS>
-
-<AD_WINDOW_ACCESS>
-  <AD_WINDOW_ACCESS_ID><![CDATA[39F74516EC5A4211BEB19A0A7C0408A9]]></AD_WINDOW_ACCESS_ID>
-  <AD_WINDOW_ID><![CDATA[6EFB8443A1C64F3D926CE42A0E40631C]]></AD_WINDOW_ID>
-  <AD_ROLE_ID><![CDATA[E669860946664B24BD1AE1ACDF2F5FC3]]></AD_ROLE_ID>
-  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
-  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-  <CREATED><![CDATA[2013-07-04 23:45:47.829]]></CREATED>
-  <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:45:47.829]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
-  <ISREADWRITE><![CDATA[Y]]></ISREADWRITE>
-</AD_WINDOW_ACCESS>
-
-<AD_WINDOW_ACCESS>
   <AD_WINDOW_ACCESS_ID><![CDATA[39FFC80B0E184457864752A12496DF96]]></AD_WINDOW_ACCESS_ID>
   <AD_WINDOW_ID><![CDATA[1002100003]]></AD_WINDOW_ID>
   <AD_ROLE_ID><![CDATA[0D4689364DDB473BB3023E4E554C8762]]></AD_ROLE_ID>
@@ -6665,20 +6623,6 @@
 </AD_WINDOW_ACCESS>
 
 <AD_WINDOW_ACCESS>
-  <AD_WINDOW_ACCESS_ID><![CDATA[3F523C58D9BB460F9407ED212FD11933]]></AD_WINDOW_ACCESS_ID>
-  <AD_WINDOW_ID><![CDATA[FF8080813161A3D301316208017A0011]]></AD_WINDOW_ID>
-  <AD_ROLE_ID><![CDATA[6DCC4F942CE944F997596B9EA51A4FEB]]></AD_ROLE_ID>
-  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
-  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-  <CREATED><![CDATA[2013-07-04 23:45:47.828]]></CREATED>
-  <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:45:47.828]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
-  <ISREADWRITE><![CDATA[Y]]></ISREADWRITE>
-</AD_WINDOW_ACCESS>
-
-<AD_WINDOW_ACCESS>
   <AD_WINDOW_ACCESS_ID><![CDATA[3F7BC8C12CBA45FF9C56298293BEA5F1]]></AD_WINDOW_ACCESS_ID>
   <AD_WINDOW_ID><![CDATA[3596042B422E4F049F9E4AAED238C219]]></AD_WINDOW_ID>
   <AD_ROLE_ID><![CDATA[42D0EEB1C66F497A90DD526DC597E6F0]]></AD_ROLE_ID>
@@ -10305,20 +10249,6 @@
 </AD_WINDOW_ACCESS>
 
 <AD_WINDOW_ACCESS>
-  <AD_WINDOW_ACCESS_ID><![CDATA[612E075C39494665AA643CAEC7E94053]]></AD_WINDOW_ACCESS_ID>
-  <AD_WINDOW_ID><![CDATA[FF8080813161A3D301316208017A0011]]></AD_WINDOW_ID>
-  <AD_ROLE_ID><![CDATA[F3196A30B53A42778727B2852FF90C24]]></AD_ROLE_ID>
-  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
-  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-  <CREATED><![CDATA[2013-07-04 23:45:47.816]]></CREATED>
-  <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:45:47.816]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
-  <ISREADWRITE><![CDATA[Y]]></ISREADWRITE>
-</AD_WINDOW_ACCESS>
-
-<AD_WINDOW_ACCESS>
   <AD_WINDOW_ACCESS_ID><![CDATA[6137D70436F24AE697BF9EB9CD7393E4]]></AD_WINDOW_ACCESS_ID>
   <AD_WINDOW_ID><![CDATA[800060]]></AD_WINDOW_ID>
   <AD_ROLE_ID><![CDATA[42D0EEB1C66F497A90DD526DC597E6F0]]></AD_ROLE_ID>
@@ -11313,20 +11243,6 @@
 </AD_WINDOW_ACCESS>
 
 <AD_WINDOW_ACCESS>
-  <AD_WINDOW_ACCESS_ID><![CDATA[6987735A25314FF089D615EEC430B116]]></AD_WINDOW_ACCESS_ID>
-  <AD_WINDOW_ID><![CDATA[FF8080813161A3D301316208017A0011]]></AD_WINDOW_ID>
-  <AD_ROLE_ID><![CDATA[9A2D4EC760704A79BAFF8FF244FE0273]]></AD_ROLE_ID>
-  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
-  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-  <CREATED><![CDATA[2013-07-04 23:45:47.813]]></CREATED>
-  <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:45:47.813]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
-  <ISREADWRITE><![CDATA[Y]]></ISREADWRITE>
-</AD_WINDOW_ACCESS>
-
-<AD_WINDOW_ACCESS>
   <AD_WINDOW_ACCESS_ID><![CDATA[69892AC9CE0748498AFCB7475FD9FBD1]]></AD_WINDOW_ACCESS_ID>
   <AD_WINDOW_ID><![CDATA[FC6A51DF5F32451987C0C84D7B338B94]]></AD_WINDOW_ID>
   <AD_ROLE_ID><![CDATA[6DCC4F942CE944F997596B9EA51A4FEB]]></AD_ROLE_ID>
@@ -12251,20 +12167,6 @@
 </AD_WINDOW_ACCESS>
 
 <AD_WINDOW_ACCESS>
-  <AD_WINDOW_ACCESS_ID><![CDATA[73228AA045764054B083AF1ED1AF53ED]]></AD_WINDOW_ACCESS_ID>
-  <AD_WINDOW_ID><![CDATA[FF8080813161A3D301316208017A0011]]></AD_WINDOW_ID>
-  <AD_ROLE_ID><![CDATA[F77D70601AD549B19DE47965F6D48D12]]></AD_ROLE_ID>
-  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
-  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-  <CREATED><![CDATA[2013-07-04 23:45:47.81]]></CREATED>
-  <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:45:47.81]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
-  <ISREADWRITE><![CDATA[Y]]></ISREADWRITE>
-</AD_WINDOW_ACCESS>
-
-<AD_WINDOW_ACCESS>
   <AD_WINDOW_ACCESS_ID><![CDATA[735E5F3825704F31A28BFA8765EA367E]]></AD_WINDOW_ACCESS_ID>
   <AD_WINDOW_ID><![CDATA[800066]]></AD_WINDOW_ID>
   <AD_ROLE_ID><![CDATA[E669860946664B24BD1AE1ACDF2F5FC3]]></AD_ROLE_ID>
@@ -14253,20 +14155,6 @@
 </AD_WINDOW_ACCESS>
 
 <AD_WINDOW_ACCESS>
-  <AD_WINDOW_ACCESS_ID><![CDATA[8713EF46FAD8436EABF163CD3C2E2E42]]></AD_WINDOW_ACCESS_ID>
-  <AD_WINDOW_ID><![CDATA[FF8080813161A3D301316208017A0011]]></AD_WINDOW_ID>
-  <AD_ROLE_ID><![CDATA[8CB7726D1DCD435FAF7D1654C9560F81]]></AD_ROLE_ID>
-  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
-  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-  <CREATED><![CDATA[2013-07-04 23:45:47.804]]></CREATED>
-  <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:45:47.804]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
-  <ISREADWRITE><![CDATA[Y]]></ISREADWRITE>
-</AD_WINDOW_ACCESS>
-
-<AD_WINDOW_ACCESS>
   <AD_WINDOW_ACCESS_ID><![CDATA[87383F424DCC4F7B84C04F978B49E785]]></AD_WINDOW_ACCESS_ID>
   <AD_WINDOW_ID><![CDATA[137]]></AD_WINDOW_ID>
   <AD_ROLE_ID><![CDATA[42D0EEB1C66F497A90DD526DC597E6F0]]></AD_ROLE_ID>
@@ -23213,20 +23101,6 @@
 </AD_WINDOW_ACCESS>
 
 <AD_WINDOW_ACCESS>
-  <AD_WINDOW_ACCESS_ID><![CDATA[D9E50FAC77F34DA5A060AA6873288162]]></AD_WINDOW_ACCESS_ID>
-  <AD_WINDOW_ID><![CDATA[FF8080813161A3D301316208017A0011]]></AD_WINDOW_ID>
-  <AD_ROLE_ID><![CDATA[DB6660F6713A4DCFA320A502B4A0E670]]></AD_ROLE_ID>
-  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
-  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-  <CREATED><![CDATA[2013-07-04 23:45:47.778]]></CREATED>
-  <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:45:47.778]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
-  <ISREADWRITE><![CDATA[Y]]></ISREADWRITE>
-</AD_WINDOW_ACCESS>
-
-<AD_WINDOW_ACCESS>
   <AD_WINDOW_ACCESS_ID><![CDATA[D9EEAD5412AB46B69CCF03D21D1BE654]]></AD_WINDOW_ACCESS_ID>
   <AD_WINDOW_ID><![CDATA[191]]></AD_WINDOW_ID>
   <AD_ROLE_ID><![CDATA[DB6660F6713A4DCFA320A502B4A0E670]]></AD_ROLE_ID>
@@ -23409,20 +23283,6 @@
 </AD_WINDOW_ACCESS>
 
 <AD_WINDOW_ACCESS>
-  <AD_WINDOW_ACCESS_ID><![CDATA[DB388E2FBB7944B5A7C96B438CD99C0D]]></AD_WINDOW_ACCESS_ID>
-  <AD_WINDOW_ID><![CDATA[FF8080813161A3D301316208017A0011]]></AD_WINDOW_ID>
-  <AD_ROLE_ID><![CDATA[1CAE17A7848D4F0BAAF21FEB17045B88]]></AD_ROLE_ID>
-  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
-  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-  <CREATED><![CDATA[2013-07-04 23:45:47.778]]></CREATED>
-  <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:45:47.778]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
-  <ISREADWRITE><![CDATA[Y]]></ISREADWRITE>
-</AD_WINDOW_ACCESS>
-
-<AD_WINDOW_ACCESS>
   <AD_WINDOW_ACCESS_ID><![CDATA[DB48386099F64A5C8FA0C55262A9C043]]></AD_WINDOW_ACCESS_ID>
   <AD_WINDOW_ID><![CDATA[210]]></AD_WINDOW_ID>
   <AD_ROLE_ID><![CDATA[0D4689364DDB473BB3023E4E554C8762]]></AD_ROLE_ID>
@@ -25481,20 +25341,6 @@
 </AD_WINDOW_ACCESS>
 
 <AD_WINDOW_ACCESS>
-  <AD_WINDOW_ACCESS_ID><![CDATA[F088FDD985574F5BAB83DA8C2D60A15E]]></AD_WINDOW_ACCESS_ID>
-  <AD_WINDOW_ID><![CDATA[FF8080813161A3D301316208017A0011]]></AD_WINDOW_ID>
-  <AD_ROLE_ID><![CDATA[42D0EEB1C66F497A90DD526DC597E6F0]]></AD_ROLE_ID>
-  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
-  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-  <CREATED><![CDATA[2013-07-04 23:45:47.772]]></CREATED>
-  <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:45:47.772]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
-  <ISREADWRITE><![CDATA[Y]]></ISREADWRITE>
-</AD_WINDOW_ACCESS>
-
-<AD_WINDOW_ACCESS>
   <AD_WINDOW_ACCESS_ID><![CDATA[F0B82CA9C951421A82B849AF96124A65]]></AD_WINDOW_ACCESS_ID>
   <AD_WINDOW_ID><![CDATA[129]]></AD_WINDOW_ID>
   <AD_ROLE_ID><![CDATA[F77D70601AD549B19DE47965F6D48D12]]></AD_ROLE_ID>
--- a/referencedata/sampledata/F_B_International_Group/OBUIAPP_VIEW_ROLE_ACCESS.xml	Tue May 19 16:37:18 2015 +0000
+++ b/referencedata/sampledata/F_B_International_Group/OBUIAPP_VIEW_ROLE_ACCESS.xml	Tue May 19 22:35:00 2015 +0200
@@ -14,32 +14,6 @@
 </OBUIAPP_VIEW_ROLE_ACCESS>
 
 <OBUIAPP_VIEW_ROLE_ACCESS>
-  <OBUIAPP_VIEW_ROLE_ACCESS_ID><![CDATA[06C7513956684F7AAD8FE8A3361ADA08]]></OBUIAPP_VIEW_ROLE_ACCESS_ID>
-  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
-  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-  <OBUIAPP_VIEW_IMPL_ID><![CDATA[FF808081314D5BAC01314D64B9920013]]></OBUIAPP_VIEW_IMPL_ID>
-  <AD_ROLE_ID><![CDATA[0D4689364DDB473BB3023E4E554C8762]]></AD_ROLE_ID>
-  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-  <CREATED><![CDATA[2013-07-04 23:45:48.348]]></CREATED>
-  <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:45:48.348]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
-</OBUIAPP_VIEW_ROLE_ACCESS>
-
-<OBUIAPP_VIEW_ROLE_ACCESS>
-  <OBUIAPP_VIEW_ROLE_ACCESS_ID><![CDATA[07118FD604A2494AB0CF0A81B946D7D3]]></OBUIAPP_VIEW_ROLE_ACCESS_ID>
-  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
-  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-  <OBUIAPP_VIEW_IMPL_ID><![CDATA[FF808081314D5BAC01314D64B9920013]]></OBUIAPP_VIEW_IMPL_ID>
-  <AD_ROLE_ID><![CDATA[42D0EEB1C66F497A90DD526DC597E6F0]]></AD_ROLE_ID>
-  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-  <CREATED><![CDATA[2013-07-04 23:45:48.348]]></CREATED>
-  <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:45:48.348]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
-</OBUIAPP_VIEW_ROLE_ACCESS>
-
-<OBUIAPP_VIEW_ROLE_ACCESS>
   <OBUIAPP_VIEW_ROLE_ACCESS_ID><![CDATA[07E176A7287E4B5BA46ED04074C9D4B4]]></OBUIAPP_VIEW_ROLE_ACCESS_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
@@ -66,19 +40,6 @@
 </OBUIAPP_VIEW_ROLE_ACCESS>
 
 <OBUIAPP_VIEW_ROLE_ACCESS>
-  <OBUIAPP_VIEW_ROLE_ACCESS_ID><![CDATA[19C65E9F76544DCBBB4BC035E3C659B6]]></OBUIAPP_VIEW_ROLE_ACCESS_ID>
-  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
-  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-  <OBUIAPP_VIEW_IMPL_ID><![CDATA[FF808081314D5BAC01314D64B9920013]]></OBUIAPP_VIEW_IMPL_ID>
-  <AD_ROLE_ID><![CDATA[F77D70601AD549B19DE47965F6D48D12]]></AD_ROLE_ID>
-  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-  <CREATED><![CDATA[2013-07-04 23:45:48.348]]></CREATED>
-  <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:45:48.348]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
-</OBUIAPP_VIEW_ROLE_ACCESS>
-
-<OBUIAPP_VIEW_ROLE_ACCESS>
   <OBUIAPP_VIEW_ROLE_ACCESS_ID><![CDATA[345342DCE896406EAA565EE2010FCEA0]]></OBUIAPP_VIEW_ROLE_ACCESS_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
@@ -118,19 +79,6 @@
 </OBUIAPP_VIEW_ROLE_ACCESS>
 
 <OBUIAPP_VIEW_ROLE_ACCESS>
-  <OBUIAPP_VIEW_ROLE_ACCESS_ID><![CDATA[3F011D01E7D1474883B919CA494B1BD3]]></OBUIAPP_VIEW_ROLE_ACCESS_ID>
-  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
-  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-  <OBUIAPP_VIEW_IMPL_ID><![CDATA[FF808081314D5BAC01314D64B9920013]]></OBUIAPP_VIEW_IMPL_ID>
-  <AD_ROLE_ID><![CDATA[8CB7726D1DCD435FAF7D1654C9560F81]]></AD_ROLE_ID>
-  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-  <CREATED><![CDATA[2013-07-04 23:45:48.348]]></CREATED>
-  <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:45:48.348]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
-</OBUIAPP_VIEW_ROLE_ACCESS>
-
-<OBUIAPP_VIEW_ROLE_ACCESS>
   <OBUIAPP_VIEW_ROLE_ACCESS_ID><![CDATA[4FBFCF5BAEE84CC6903446D32055417C]]></OBUIAPP_VIEW_ROLE_ACCESS_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
@@ -170,19 +118,6 @@
 </OBUIAPP_VIEW_ROLE_ACCESS>
 
 <OBUIAPP_VIEW_ROLE_ACCESS>
-  <OBUIAPP_VIEW_ROLE_ACCESS_ID><![CDATA[5D794F95CEA5421DA04990CC6A4AC638]]></OBUIAPP_VIEW_ROLE_ACCESS_ID>
-  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
-  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-  <OBUIAPP_VIEW_IMPL_ID><![CDATA[FF808081314D5BAC01314D64B9920013]]></OBUIAPP_VIEW_IMPL_ID>
-  <AD_ROLE_ID><![CDATA[1CAE17A7848D4F0BAAF21FEB17045B88]]></AD_ROLE_ID>
-  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-  <CREATED><![CDATA[2013-07-04 23:45:48.348]]></CREATED>
-  <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:45:48.348]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
-</OBUIAPP_VIEW_ROLE_ACCESS>
-
-<OBUIAPP_VIEW_ROLE_ACCESS>
   <OBUIAPP_VIEW_ROLE_ACCESS_ID><![CDATA[5D8F310BB14F41CE936809187CE11372]]></OBUIAPP_VIEW_ROLE_ACCESS_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
@@ -235,19 +170,6 @@
 </OBUIAPP_VIEW_ROLE_ACCESS>
 
 <OBUIAPP_VIEW_ROLE_ACCESS>
-  <OBUIAPP_VIEW_ROLE_ACCESS_ID><![CDATA[72F205826FFF49FAA4B3D0ECE4AD58C3]]></OBUIAPP_VIEW_ROLE_ACCESS_ID>
-  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
-  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-  <OBUIAPP_VIEW_IMPL_ID><![CDATA[FF808081314D5BAC01314D64B9920013]]></OBUIAPP_VIEW_IMPL_ID>
-  <AD_ROLE_ID><![CDATA[6DCC4F942CE944F997596B9EA51A4FEB]]></AD_ROLE_ID>
-  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-  <CREATED><![CDATA[2013-07-04 23:45:48.348]]></CREATED>
-  <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:45:48.348]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
-</OBUIAPP_VIEW_ROLE_ACCESS>
-
-<OBUIAPP_VIEW_ROLE_ACCESS>
   <OBUIAPP_VIEW_ROLE_ACCESS_ID><![CDATA[75C70A2579ED4134AC6EF293ECC45DD6]]></OBUIAPP_VIEW_ROLE_ACCESS_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
@@ -274,32 +196,6 @@
 </OBUIAPP_VIEW_ROLE_ACCESS>
 
 <OBUIAPP_VIEW_ROLE_ACCESS>
-  <OBUIAPP_VIEW_ROLE_ACCESS_ID><![CDATA[91AB97F274364DD8B67941D36C9A6B2F]]></OBUIAPP_VIEW_ROLE_ACCESS_ID>
-  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
-  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-  <OBUIAPP_VIEW_IMPL_ID><![CDATA[FF808081314D5BAC01314D64B9920013]]></OBUIAPP_VIEW_IMPL_ID>
-  <AD_ROLE_ID><![CDATA[F3196A30B53A42778727B2852FF90C24]]></AD_ROLE_ID>
-  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-  <CREATED><![CDATA[2013-07-04 23:45:48.348]]></CREATED>
-  <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:45:48.348]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
-</OBUIAPP_VIEW_ROLE_ACCESS>
-
-<OBUIAPP_VIEW_ROLE_ACCESS>
-  <OBUIAPP_VIEW_ROLE_ACCESS_ID><![CDATA[CEF890275073480DBA252F4367090111]]></OBUIAPP_VIEW_ROLE_ACCESS_ID>
-  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
-  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-  <OBUIAPP_VIEW_IMPL_ID><![CDATA[FF808081314D5BAC01314D64B9920013]]></OBUIAPP_VIEW_IMPL_ID>
-  <AD_ROLE_ID><![CDATA[E669860946664B24BD1AE1ACDF2F5FC3]]></AD_ROLE_ID>
-  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-  <CREATED><![CDATA[2013-07-04 23:45:48.348]]></CREATED>
-  <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:45:48.348]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
-</OBUIAPP_VIEW_ROLE_ACCESS>
-
-<OBUIAPP_VIEW_ROLE_ACCESS>
   <OBUIAPP_VIEW_ROLE_ACCESS_ID><![CDATA[D269E1F1038F434797F5C3ABCC2323CE]]></OBUIAPP_VIEW_ROLE_ACCESS_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
@@ -339,19 +235,6 @@
 </OBUIAPP_VIEW_ROLE_ACCESS>
 
 <OBUIAPP_VIEW_ROLE_ACCESS>
-  <OBUIAPP_VIEW_ROLE_ACCESS_ID><![CDATA[E4FFFC7D73B94EE38A8D3664A564E6F9]]></OBUIAPP_VIEW_ROLE_ACCESS_ID>
-  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
-  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-  <OBUIAPP_VIEW_IMPL_ID><![CDATA[FF808081314D5BAC01314D64B9920013]]></OBUIAPP_VIEW_IMPL_ID>
-  <AD_ROLE_ID><![CDATA[9A2D4EC760704A79BAFF8FF244FE0273]]></AD_ROLE_ID>
-  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-  <CREATED><![CDATA[2013-07-04 23:45:48.348]]></CREATED>
-  <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:45:48.348]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
-</OBUIAPP_VIEW_ROLE_ACCESS>
-
-<OBUIAPP_VIEW_ROLE_ACCESS>
   <OBUIAPP_VIEW_ROLE_ACCESS_ID><![CDATA[E7FE9B7F974747D68395AD57E864D3BE]]></OBUIAPP_VIEW_ROLE_ACCESS_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
@@ -365,19 +248,6 @@
 </OBUIAPP_VIEW_ROLE_ACCESS>
 
 <OBUIAPP_VIEW_ROLE_ACCESS>
-  <OBUIAPP_VIEW_ROLE_ACCESS_ID><![CDATA[F06A5292541B46F58B689B5A0B77D7B6]]></OBUIAPP_VIEW_ROLE_ACCESS_ID>
-  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
-  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-  <OBUIAPP_VIEW_IMPL_ID><![CDATA[FF808081314D5BAC01314D64B9920013]]></OBUIAPP_VIEW_IMPL_ID>
-  <AD_ROLE_ID><![CDATA[DB6660F6713A4DCFA320A502B4A0E670]]></AD_ROLE_ID>
-  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-  <CREATED><![CDATA[2013-07-04 23:45:48.348]]></CREATED>
-  <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:45:48.348]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
-</OBUIAPP_VIEW_ROLE_ACCESS>
-
-<OBUIAPP_VIEW_ROLE_ACCESS>
   <OBUIAPP_VIEW_ROLE_ACCESS_ID><![CDATA[FA1B619209E5411CAEAB65E73E155CC7]]></OBUIAPP_VIEW_ROLE_ACCESS_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
--- a/referencedata/sampledata/QA_Testing/AD_WINDOW_ACCESS.xml	Tue May 19 16:37:18 2015 +0000
+++ b/referencedata/sampledata/QA_Testing/AD_WINDOW_ACCESS.xml	Tue May 19 22:35:00 2015 +0200
@@ -295,20 +295,6 @@
 </AD_WINDOW_ACCESS>
 
 <AD_WINDOW_ACCESS>
-  <AD_WINDOW_ACCESS_ID><![CDATA[08F4243C36764925B843C1C39201DACE]]></AD_WINDOW_ACCESS_ID>
-  <AD_WINDOW_ID><![CDATA[FF8080813161A3D301316208017A0011]]></AD_WINDOW_ID>
-  <AD_ROLE_ID><![CDATA[CC6AB5B4C4B54CB79103C96AD2B90750]]></AD_ROLE_ID>
-  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
-  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-  <CREATED><![CDATA[2013-07-04 23:38:18.045]]></CREATED>
-  <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:18.045]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
-  <ISREADWRITE><![CDATA[Y]]></ISREADWRITE>
-</AD_WINDOW_ACCESS>
-
-<AD_WINDOW_ACCESS>
   <AD_WINDOW_ACCESS_ID><![CDATA[09A02EE3F62C41279BD2505E1897F559]]></AD_WINDOW_ACCESS_ID>
   <AD_WINDOW_ID><![CDATA[AB30B4B4C94540849D221C4BC31A9816]]></AD_WINDOW_ID>
   <AD_ROLE_ID><![CDATA[0256D4272D82412C9CDF41B67E362599]]></AD_ROLE_ID>
@@ -4117,20 +4103,6 @@
 </AD_WINDOW_ACCESS>
 
 <AD_WINDOW_ACCESS>
-  <AD_WINDOW_ACCESS_ID><![CDATA[758C1AD109724E3097ED975157B30B0D]]></AD_WINDOW_ACCESS_ID>
-  <AD_WINDOW_ID><![CDATA[FF8080813161A3D301316208017A0011]]></AD_WINDOW_ID>
-  <AD_ROLE_ID><![CDATA[0256D4272D82412C9CDF41B67E362599]]></AD_ROLE_ID>
-  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
-  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-  <CREATED><![CDATA[2013-07-04 23:38:18.031]]></CREATED>
-  <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:18.031]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
-  <ISREADWRITE><![CDATA[Y]]></ISREADWRITE>
-</AD_WINDOW_ACCESS>
-
-<AD_WINDOW_ACCESS>
   <AD_WINDOW_ACCESS_ID><![CDATA[7603BE6F0ED245D98B6F9F3BA2825BD2]]></AD_WINDOW_ACCESS_ID>
   <AD_WINDOW_ID><![CDATA[81BAC97FE7754C669254C9CF4FA20292]]></AD_WINDOW_ID>
   <AD_ROLE_ID><![CDATA[0256D4272D82412C9CDF41B67E362599]]></AD_ROLE_ID>
@@ -5531,20 +5503,6 @@
 </AD_WINDOW_ACCESS>
 
 <AD_WINDOW_ACCESS>
-  <AD_WINDOW_ACCESS_ID><![CDATA[9EE1417381E1417F969D6D5B9B6B7F00]]></AD_WINDOW_ACCESS_ID>
-  <AD_WINDOW_ID><![CDATA[FF8080813161A3D301316208017A0011]]></AD_WINDOW_ID>
-  <AD_ROLE_ID><![CDATA[4028E6C72959682B01295A071429011E]]></AD_ROLE_ID>
-  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
-  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-  <CREATED><![CDATA[2013-07-04 23:38:18.026]]></CREATED>
-  <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:18.026]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
-  <ISREADWRITE><![CDATA[Y]]></ISREADWRITE>
-</AD_WINDOW_ACCESS>
-
-<AD_WINDOW_ACCESS>
   <AD_WINDOW_ACCESS_ID><![CDATA[9F114635D481408F84DBB2E7915E6F14]]></AD_WINDOW_ACCESS_ID>
   <AD_WINDOW_ID><![CDATA[242]]></AD_WINDOW_ID>
   <AD_ROLE_ID><![CDATA[0256D4272D82412C9CDF41B67E362599]]></AD_ROLE_ID>
--- a/referencedata/sampledata/QA_Testing/OBUIAPP_VIEW_ROLE_ACCESS.xml	Tue May 19 16:37:18 2015 +0000
+++ b/referencedata/sampledata/QA_Testing/OBUIAPP_VIEW_ROLE_ACCESS.xml	Tue May 19 22:35:00 2015 +0200
@@ -27,19 +27,6 @@
 </OBUIAPP_VIEW_ROLE_ACCESS>
 
 <OBUIAPP_VIEW_ROLE_ACCESS>
-  <OBUIAPP_VIEW_ROLE_ACCESS_ID><![CDATA[2E415324BC4E488E9164ABAF31DD681E]]></OBUIAPP_VIEW_ROLE_ACCESS_ID>
-  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
-  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-  <OBUIAPP_VIEW_IMPL_ID><![CDATA[FF808081314D5BAC01314D64B9920013]]></OBUIAPP_VIEW_IMPL_ID>
-  <AD_ROLE_ID><![CDATA[4028E6C72959682B01295A071429011E]]></AD_ROLE_ID>
-  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-  <CREATED><![CDATA[2013-07-04 23:38:18.226]]></CREATED>
-  <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:18.226]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
-</OBUIAPP_VIEW_ROLE_ACCESS>
-
-<OBUIAPP_VIEW_ROLE_ACCESS>
   <OBUIAPP_VIEW_ROLE_ACCESS_ID><![CDATA[5A75940CEBAE4606AB6E88D22087A920]]></OBUIAPP_VIEW_ROLE_ACCESS_ID>
   <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
@@ -91,30 +78,4 @@
   <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
 </OBUIAPP_VIEW_ROLE_ACCESS>
 
-<OBUIAPP_VIEW_ROLE_ACCESS>
-  <OBUIAPP_VIEW_ROLE_ACCESS_ID><![CDATA[D7FE1C7D73444A5CAD10DEE1E6ABFDE9]]></OBUIAPP_VIEW_ROLE_ACCESS_ID>
-  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
-  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-  <OBUIAPP_VIEW_IMPL_ID><![CDATA[FF808081314D5BAC01314D64B9920013]]></OBUIAPP_VIEW_IMPL_ID>
-  <AD_ROLE_ID><![CDATA[0256D4272D82412C9CDF41B67E362599]]></AD_ROLE_ID>
-  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-  <CREATED><![CDATA[2013-07-04 23:38:18.226]]></CREATED>
-  <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:18.226]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
-</OBUIAPP_VIEW_ROLE_ACCESS>
-
-<OBUIAPP_VIEW_ROLE_ACCESS>
-  <OBUIAPP_VIEW_ROLE_ACCESS_ID><![CDATA[E3A9A95A34A84E9A92FC78AF31B7D2F6]]></OBUIAPP_VIEW_ROLE_ACCESS_ID>
-  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
-  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-  <OBUIAPP_VIEW_IMPL_ID><![CDATA[FF808081314D5BAC01314D64B9920013]]></OBUIAPP_VIEW_IMPL_ID>
-  <AD_ROLE_ID><![CDATA[CC6AB5B4C4B54CB79103C96AD2B90750]]></AD_ROLE_ID>
-  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-  <CREATED><![CDATA[2013-07-04 23:38:18.226]]></CREATED>
-  <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:18.226]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
-</OBUIAPP_VIEW_ROLE_ACCESS>
-
 </data>
--- a/src/org/openbravo/erpCommon/security/Login.java	Tue May 19 16:37:18 2015 +0000
+++ b/src/org/openbravo/erpCommon/security/Login.java	Tue May 19 22:35:00 2015 +0200
@@ -11,7 +11,7 @@
  * under the License. 
  * The Original Code is Openbravo ERP. 
  * The Initial Developer of the Original Code is Openbravo SLU 
- * All portions are Copyright (C) 2001-2014 Openbravo SLU 
+ * All portions are Copyright (C) 2001-2015 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -41,7 +41,6 @@
 import org.openbravo.erpCommon.utility.OBVersion;
 import org.openbravo.erpCommon.utility.PropertyException;
 import org.openbravo.erpCommon.utility.Utility;
-import org.openbravo.model.ad.module.Module;
 import org.openbravo.model.ad.system.Client;
 import org.openbravo.model.ad.system.SystemInformation;
 import org.openbravo.xmlEngine.XmlDocument;
@@ -49,7 +48,6 @@
 public class Login extends HttpBaseServlet {
   private static final long serialVersionUID = 1L;
 
-  private static final String GOOGLE_INTEGRATION_MODULE_ID = "FF8080813129ADA401312CA1222A0005";
   private static final String GOOGLE_PREFERENCE_PROPERTY = "OBSEIG_ShowGIcon";
 
   @Inject
@@ -253,12 +251,11 @@
     boolean showForgeLogo = true;
     boolean showITLogo = false;
     boolean showCompanyLogo = false;
-    boolean showGoogleIcon = false;
+    boolean showGSignInButtonDemo = true;
 
     String itLink = "";
     String companyLink = "";
     SystemInformation sysInfo = OBDal.getInstance().get(SystemInformation.class, "0");
-    Module module = OBDal.getInstance().get(Module.class, GOOGLE_INTEGRATION_MODULE_ID);
 
     ActivationKey ak = ActivationKey.getInstance(true);
     if (ak.isActive()) {
@@ -268,9 +265,7 @@
       q.setParameter("prop", GOOGLE_PREFERENCE_PROPERTY);
 
       // show by default - not show when there is a preference to disable it
-      showGoogleIcon = q.list().size() == 0;
-    } else {
-      showGoogleIcon = (module != null && module.isEnabled());
+      showGSignInButtonDemo = q.list().size() == 0;
     }
 
     if (sysInfo == null) {
@@ -339,24 +334,68 @@
     xmlDocument.setParameter("recBrowserMsgTitle", recBrowserMsgTitleFinal.replaceAll("\\n", "\n"));
     xmlDocument.setParameter("recBrowserMsgText", recBrowserMsgTextFinal.replaceAll("\\n", "\n"));
 
-    if (showGoogleIcon) {
-      String link;
+    if (showGSignInButtonDemo || !signInProvider.isUnsatisfied()) {
+      String link = "<span class=\"LabelText Login_LabelText\">"
+          + Utility.messageBD(this, "OBUIAPP_SignIn", vars.getLanguage()) + "</span>";
       if (signInProvider.isUnsatisfied()) {
-        // there is no external sign in provider, using default OpenID link
-        String authServlet = "../org.openbravo.service.integration.google/auth.html";
-        link = "<p class=\"LabelText Login_LabelText\" style=\"line-height:24px;\">"
-            + Utility.messageBD(this, "OBSEIG_SignIn", vars.getLanguage()) + "&nbsp; <a href=\""
-            + authServlet + "\" title=\""
-            + Utility.messageBD(this, "OBSEIG_SignInAltMsg", vars.getLanguage())
-            + "\" target=\"_top\" "
-            + "><img style=\"vertical-align:middle;\" src=\"../web/images/google.png\" alt=\""
-            + Utility.messageBD(this, "OBSEIG_SignInAltMsg", vars.getLanguage())
-            + "\" width=\"24\" height=\"24\" border=\"0\"/></a></p>";
+        // if there is no external sign in provider, show Google Sign In icon with demo purposes
+        String lang = OBDal.getInstance().get(Client.class, "0").getLanguage().getLanguage();
+        String message = "";
+        if (ak.isActive()) {
+          message = Utility.messageBD(this, "OBUIAPP_gSignInButtonDemoProfessional", lang);
+        } else {
+          message = Utility.messageBD(this, "OBUIAPP_ActivateMessage", lang);
+          message = message.replace("%0",
+              Utility.messageBD(this, "OBUIAPP_gSignInButtonDemoCommunity", lang));
+        }
+        message = message.replaceAll("&quot;", "\"").replaceAll("\"", "\\\\\"")
+            .replaceAll("'", "ยด");
+
+        link += "<style type=\"text/css\">" //
+            + "  .gSignInButtonDemo {" //
+            + "    display: inline-block;" //
+            + "    background-color: #dd4b39;" //
+            + "    color: white;" //
+            + "    width: 24px;" //
+            + "    border-radius: 2px;" //
+            + "    white-space: nowrap;" //
+            + "    border: 1px solid #d9d9d9;" //
+            + "  }" //
+            + "  .gSignInButtonDemo:hover," //
+            + "  .gSignInButtonDemo:active {" //
+            + "    border-color: #c0c0c0;" //
+            + "    box-shadow: 0 1px 0 rgba(0, 0, 0, 0.10);" //
+            + "    cursor: hand;" //
+            + "  }" //
+            + "  .gSignInButtonDemo:hover {" //
+            + "    background-color: #e74b37;" //
+            + "  }" //
+            + "  .gSignInButtonDemo:active {" //
+            + "    background-color: #be3e2e;" //
+            + "  }" //
+            + "  .gSignInButtonDemo > span {" //
+            + "    background: url('../web/images/gSignInButtonDemo.png') 2px 2px;" //
+            + "    height: 24px;" //
+            + "    width: 24px;" //
+            + "    margin-top: -1px;" //
+            + "    display: inline-block;" //
+            + "    vertical-align: middle;" //
+            + "  }" //
+            + "</style>" //
+            + "&nbsp;&nbsp;<div id=\"gSignInButtonDemo\" class=\"gSignInButtonDemo\" onclick='setLoginMessage(\"Error\", null, \""
+            + message
+            + "\")'>" //
+            + "  <span title=\""
+            + Utility.messageBD(this, "OBUIAPP_gSignInButtonDemoAltMsg", vars.getLanguage()) //
+            + "\"></span>" //
+            + "</div>";
       } else {
         // a module is providing a different sign in: including its HTML code in Log In page
-        link = signInProvider.get().getLoginPageSignInHTMLCode();
+        for (SignInProvider cSignInProvider : signInProvider) {
+          link += "&nbsp;";
+          link += cSignInProvider.getLoginPageSignInHTMLCode();
+        }
       }
-
       xmlDocument.setParameter("sign-in", link);
     }
 
Binary file web/images/gSignInButtonDemo.png has changed