Author: vjrj_ Date: 2012-05-21 19:22:09 +0200 (Mon, 21 May 2012) New Revision: 1874 Modified: trunk/debian/changelog trunk/debian/files trunk/src/main/java/cc/kune/core/client/actions/xml/XMLActionsParser.java trunk/src/main/java/cc/kune/core/public/about.html trunk/src/main/webapp/tutorials/barters.svg trunk/src/main/webapp/tutorials/blogs.svg trunk/src/main/webapp/tutorials/chats.svg trunk/src/main/webapp/tutorials/docs.svg trunk/src/main/webapp/tutorials/events.svg trunk/src/main/webapp/tutorials/lists.svg trunk/src/main/webapp/tutorials/tasks.svg trunk/src/main/webapp/tutorials/wiki.svg Log: CLOSED - # 273: Some http usage breaks SSL http://kune.ourproject.org/issues/ticket/273 Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2012-05-21 17:20:02 UTC (rev 1873) +++ trunk/debian/changelog 2012-05-21 17:22:09 UTC (rev 1874) @@ -1,3 +1,9 @@ +kune (0.2.0+b7) unstable; urgency=low + + * Fix some SSL issues + + -- Vicente J. Ruiz Jurado <[email protected]> Mon, 21 May 2012 01:31:41 +0200 + kune (0.2.0+b6) unstable; urgency=low * Wave code updated (changes: search via lucene, ctrl-k for links, etc) Modified: trunk/debian/files =================================================================== --- trunk/debian/files 2012-05-21 17:20:02 UTC (rev 1873) +++ trunk/debian/files 2012-05-21 17:22:09 UTC (rev 1874) @@ -1 +1 @@ -kune_0.2.0+b6_all.deb java optional +kune_0.2.0+b7_all.deb java optional Modified: trunk/src/main/java/cc/kune/core/client/actions/xml/XMLActionsParser.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/actions/xml/XMLActionsParser.java 2012-05-21 17:20:02 UTC (rev 1873) +++ trunk/src/main/java/cc/kune/core/client/actions/xml/XMLActionsParser.java 2012-05-21 17:22:09 UTC (rev 1874) @@ -169,12 +169,14 @@ // container) action = new AddGadgetAction(contentService, session, i18n, descrip.getRol().getRolRequired(), descrip.getRol().isAuthNeed(), - extension.getExtName(), descrip.getDescName(), extension.getIconUrl()); + extension.getExtName(), descrip.getDescName(), proxy(extension.getIconUrl(), + extension.getGadgetUrl())); } else { action = new NewGadgetAction(contentService, contentViewer, stateManager, session, i18n, descrip.getRol().getRolRequired(), descrip.getRol().isAuthNeed(), - extension.getExtName(), destTypeId, extension.getIconUrl(), - descrip.getNewContentTitle(), TextUtils.empty(contentIntro) ? "" : contentIntro); + extension.getExtName(), destTypeId, proxy(extension.getIconUrl(), + extension.getGadgetUrl()), descrip.getNewContentTitle(), + TextUtils.empty(contentIntro) ? "" : contentIntro); } final Provider<GuiActionDescrip> menuItemProvider = createMenuItem(descrip, tool, origTypeId, action); @@ -183,4 +185,11 @@ } } } + + private String proxy(String iconUrl, String gadgetUrl) { + // FIXME: create a proxy servlet for that + // More info: http://edwardstx.net/2010/06/http-proxy-servlet/ + return "https://www-ig-opensocial.googleusercontent.com/gadgets/proxy?refresh=86400&..." + + iconUrl + "&container=ig&gadget=" + gadgetUrl; + } } Modified: trunk/src/main/java/cc/kune/core/public/about.html =================================================================== --- trunk/src/main/java/cc/kune/core/public/about.html 2012-05-21 17:20:02 UTC (rev 1873) +++ trunk/src/main/java/cc/kune/core/public/about.html 2012-05-21 17:22:09 UTC (rev 1874) @@ -16,7 +16,7 @@ }); </script> <link - href='http://fonts.googleapis.com/css?family=Ubuntu:regular,italic,bold,bolditalic' + href='https://fonts.googleapis.com/css?family=Ubuntu:regular,italic,bold,bolditali...' rel='stylesheet' type='text/css'> <span> <a target="_blank" href="http://kune.ourproject.org/" title="kune" rel="home"> Modified: trunk/src/main/webapp/tutorials/barters.svg =================================================================== --- trunk/src/main/webapp/tutorials/barters.svg 2012-05-21 17:20:02 UTC (rev 1873) +++ trunk/src/main/webapp/tutorials/barters.svg 2012-05-21 17:22:09 UTC (rev 1874) @@ -55,7 +55,7 @@ <xhtml:link type="text/css" rel="stylesheet" - href="http://fonts.googleapis.com/css?family=Ubuntu" /> + href="https://fonts.googleapis.com/css?family=Ubuntu" /> <style id="style4495"> text { font-family: 'Ubuntu'; text-rendering: geometricPrecision; } Modified: trunk/src/main/webapp/tutorials/blogs.svg =================================================================== --- trunk/src/main/webapp/tutorials/blogs.svg 2012-05-21 17:20:02 UTC (rev 1873) +++ trunk/src/main/webapp/tutorials/blogs.svg 2012-05-21 17:22:09 UTC (rev 1874) @@ -53,7 +53,7 @@ <!-- End kune i18n part --> <!-- Start kune font part --> <xhtml:link - href="http://fonts.googleapis.com/css?family=Ubuntu" + href="https://fonts.googleapis.com/css?family=Ubuntu" rel="stylesheet" type="text/css" /> <style Modified: trunk/src/main/webapp/tutorials/chats.svg =================================================================== --- trunk/src/main/webapp/tutorials/chats.svg 2012-05-21 17:20:02 UTC (rev 1873) +++ trunk/src/main/webapp/tutorials/chats.svg 2012-05-21 17:22:09 UTC (rev 1874) @@ -55,7 +55,7 @@ <xhtml:link type="text/css" rel="stylesheet" - href="http://fonts.googleapis.com/css?family=Ubuntu" /> + href="https://fonts.googleapis.com/css?family=Ubuntu" /> <style id="style10817"> text { font-family: 'Ubuntu'; text-rendering: geometricPrecision; } Modified: trunk/src/main/webapp/tutorials/docs.svg =================================================================== --- trunk/src/main/webapp/tutorials/docs.svg 2012-05-21 17:20:02 UTC (rev 1873) +++ trunk/src/main/webapp/tutorials/docs.svg 2012-05-21 17:22:09 UTC (rev 1874) @@ -63,7 +63,7 @@ <!-- End kune i18n part --> <!-- Start kune font part --> <xhtml:link - href="http://fonts.googleapis.com/css?family=Ubuntu" + href="https://fonts.googleapis.com/css?family=Ubuntu" rel="stylesheet" type="text/css" /> <style Modified: trunk/src/main/webapp/tutorials/events.svg =================================================================== --- trunk/src/main/webapp/tutorials/events.svg 2012-05-21 17:20:02 UTC (rev 1873) +++ trunk/src/main/webapp/tutorials/events.svg 2012-05-21 17:22:09 UTC (rev 1874) @@ -53,7 +53,7 @@ <!-- End kune i18n part --> <!-- Start kune font part --> <xhtml:link - href="http://fonts.googleapis.com/css?family=Ubuntu" + href="https://fonts.googleapis.com/css?family=Ubuntu" rel="stylesheet" type="text/css" /> <style Modified: trunk/src/main/webapp/tutorials/lists.svg =================================================================== --- trunk/src/main/webapp/tutorials/lists.svg 2012-05-21 17:20:02 UTC (rev 1873) +++ trunk/src/main/webapp/tutorials/lists.svg 2012-05-21 17:22:09 UTC (rev 1874) @@ -57,7 +57,7 @@ <!-- End kune i18n part --> <!-- Start kune font part --> <xhtml:link - href="http://fonts.googleapis.com/css?family=Ubuntu" + href="https://fonts.googleapis.com/css?family=Ubuntu" rel="stylesheet" type="text/css" /> <style Modified: trunk/src/main/webapp/tutorials/tasks.svg =================================================================== --- trunk/src/main/webapp/tutorials/tasks.svg 2012-05-21 17:20:02 UTC (rev 1873) +++ trunk/src/main/webapp/tutorials/tasks.svg 2012-05-21 17:22:09 UTC (rev 1874) @@ -53,7 +53,7 @@ <!-- End kune i18n part --> <!-- Start kune font part --> <xhtml:link - href="http://fonts.googleapis.com/css?family=Ubuntu" + href="https://fonts.googleapis.com/css?family=Ubuntu" rel="stylesheet" type="text/css" /> <style Modified: trunk/src/main/webapp/tutorials/wiki.svg =================================================================== --- trunk/src/main/webapp/tutorials/wiki.svg 2012-05-21 17:20:02 UTC (rev 1873) +++ trunk/src/main/webapp/tutorials/wiki.svg 2012-05-21 17:22:09 UTC (rev 1874) @@ -55,7 +55,7 @@ <xhtml:link type="text/css" rel="stylesheet" - href="http://fonts.googleapis.com/css?family=Ubuntu" /> + href="https://fonts.googleapis.com/css?family=Ubuntu" /> <style id="style26201"> text { font-family: 'Ubuntu'; text-rendering: geometricPrecision; }