details: https://code.openbravo.com/erp/devel/pi/rev/f5809030966e changeset: 13382:f5809030966e user: Iván Perdomo <ivan.perdomo <at> openbravo.com> date: Tue Aug 02 11:45:56 2011 +0200 summary: Issue 18077: Updated messages, better error handling - The messages to the user now link to some documentation - On authentication error the user gets redirected to the login page
details: https://code.openbravo.com/erp/devel/pi/rev/2bf647250210 changeset: 13383:2bf647250210 user: Iván Perdomo <ivan.perdomo <at> openbravo.com> date: Tue Aug 02 11:50:12 2011 +0200 summary: Issue 18077: Updated .classpath.template diffstat: .classpath.template | 2 ++ modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MESSAGE.xml | 9 ++++----- modules/org.openbravo.service.integration.openid/src/org/openbravo/service/integration/openid/OpenIDManager.java | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diffs (59 lines): diff -r 9e3b529092e4 -r 2bf647250210 .classpath.template --- a/.classpath.template Tue Aug 02 11:06:11 2011 +0200 +++ b/.classpath.template Tue Aug 02 11:50:12 2011 +0200 @@ -19,6 +19,8 @@ <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="src-test"/> <classpathentry including="quartz.properties" kind="src" path="config"/> <classpathentry kind="src" path="src-gen"/> diff -r 9e3b529092e4 -r 2bf647250210 modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MESSAGE.xml --- a/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MESSAGE.xml Tue Aug 02 11:06:11 2011 +0200 +++ b/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MESSAGE.xml Tue Aug 02 11:50:12 2011 +0200 @@ -6,7 +6,8 @@ <!--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 links your Openbravo User with your Google Account. After completion if you access the system using your Google Account you will be logged in with you current User.]]></MSGTEXT> +<!--FF808081316ACC4501316ADAA4FB0006--> <MSGTEXT><![CDATA[This process links your Openbravo User with your Google Account. After completion if you access the system using your Google Account you will be logged in with you current User. +Do yo want to continue?]]></MSGTEXT> <!--FF808081316ACC4501316ADAA4FB0006--> <MSGTYPE><![CDATA[I]]></MSGTYPE> <!--FF808081316ACC4501316ADAA4FB0006--> <AD_MODULE_ID><![CDATA[FF8080813129ADA401312CA1222A0005]]></AD_MODULE_ID> <!--FF808081316ACC4501316ADAA4FB0006--></AD_MESSAGE> @@ -50,8 +51,7 @@ <!--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@@. -Learn more about it or contact this instance System Administrator for help.]]></MSGTEXT> +<!--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> @@ -63,8 +63,7 @@ <!--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@. -Learn more about it or contact this instance System Administrator for help.]]></MSGTEXT> +<!--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> diff -r 9e3b529092e4 -r 2bf647250210 modules/org.openbravo.service.integration.openid/src/org/openbravo/service/integration/openid/OpenIDManager.java --- a/modules/org.openbravo.service.integration.openid/src/org/openbravo/service/integration/openid/OpenIDManager.java Tue Aug 02 11:06:11 2011 +0200 +++ b/modules/org.openbravo.service.integration.openid/src/org/openbravo/service/integration/openid/OpenIDManager.java Tue Aug 02 11:50:12 2011 +0200 @@ -129,8 +129,8 @@ httpResp.sendRedirect(authReq.getDestinationUrl(true)); } catch (OpenIDException e) { - // present error to the user - throw new ServletException(e); + log.error("Error trying to authenticate with Google Services: " + e.getMessage(), e); + httpResp.sendRedirect(httpReq.getHeader("Referer")); } return null; ------------------------------------------------------------------------------ BlackBerry® DevCon Americas, Oct. 18-20, San Francisco, CA The must-attend event for mobile developers. Connect with experts. Get tools for creating Super Apps. See the latest technologies. Sessions, hands-on labs, demos & much more. Register early & save! http://p.sf.net/sfu/rim-blackberry-1 _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
