SAK-30338 - A few followup issues for the simple rss portlet tool after

merge
thakursir · Mar 1, 2016 · 4df6778 · 4df6778
1 parent baac0c6
commit 4df6778
Show file tree

Hide file tree

Showing 100 changed files with 33 additions and 4,321 deletions.
diff --git a/reference/docs/conversion/sakai_11_mysql_conversion.sql b/reference/docs/conversion/sakai_11_mysql_conversion.sql
@@ -2,10 +2,10 @@
 -- ---------------------------
 -- Add the titles from all existing news tools
 INSERT INTO SAKAI_SITE_TOOL_PROPERTY (site_id, tool_id, name, value)
-	SELECT site_id, tool_id, 'javax.portlet:portlet_title', title FROM SAKAI_SITE_TOOL WHERE registration = 'sakai.news';
+	SELECT site_id, tool_id, 'javax.portlet-portlet_title', title FROM SAKAI_SITE_TOOL WHERE registration = 'sakai.news';
 
 -- Setup all instances with the URL
-UPDATE SAKAI_SITE_TOOL_PROPERTY SET name = 'javax.portlet:feed_url' WHERE name = 'channel-url';
+UPDATE SAKAI_SITE_TOOL_PROPERTY SET name = 'javax.portlet-feed_url' WHERE name = 'channel-url';
 
 -- Finally, convert all news tools to the new portlet (must run last)
 UPDATE SAKAI_SITE_TOOL SET registration = 'sakai.simple.rss' WHERE registration = 'sakai.news';

diff --git a/reference/docs/conversion/sakai_11_oracle_conversion.sql b/reference/docs/conversion/sakai_11_oracle_conversion.sql
@@ -2,10 +2,10 @@
 -- ---------------------------
 -- Add the titles from all existing news tools
 INSERT INTO sakai_site_tool_property (site_id, tool_id, name, value)
-	SELECT site_id, tool_id, 'javax.portlet:portlet_title', title FROM sakai_site_tool WHERE registration = 'sakai.news';
+	SELECT site_id, tool_id, 'javax.portlet-portlet_title', title FROM sakai_site_tool WHERE registration = 'sakai.news';
 
 -- Setup all instances with the URL
-UPDATE sakai_site_tool_property SET name = 'javax.portlet:feed_url' WHERE name = 'channel-url';
+UPDATE sakai_site_tool_property SET name = 'javax.portlet-feed_url' WHERE name = 'channel-url';
 
 -- Finally, convert all news tools to the new portlet (must run last)
 UPDATE sakai_site_tool SET registration = 'sakai.simple.rss' WHERE registration = 'sakai.news';

diff --git a/reference/library/src/morpheus-master/sass/base/_icons.scss b/reference/library/src/morpheus-master/sass/base/_icons.scss
@@ -32,6 +32,7 @@
 	.icon-sakai-mailbox{					@extend .fa-envelope-o;}
 	.icon-sakai-emailtemplateservice{			@extend .fa-envelope;}
 	.icon-sakai-news{					@extend .fa-newspaper-o;}
+	.icon-sakai-simple-rss{					@extend .fa-newspaper-o;}
 	.icon-sakai-basiclti{					@extend .fa-globe;}
 	.icon-sakai-messages{					@extend .fa-inbox;}
 	.icon-sakai-dashboard{					@extend .fa-dashboard;}

diff --git a/simple-rss-portlet/.classpath b/simple-rss-portlet/.classpath
diff --git a/simple-rss-portlet/.project b/simple-rss-portlet/.project
diff --git a/simple-rss-portlet/src/main/java/au/edu/anu/portal/portlets/rss/utils/messages.properties b/simple-rss-portlet/src/main/java/au/edu/anu/portal/portlets/rss/utils/messages.properties
@@ -1,7 +1,7 @@
 
 connection.error=Connection failed
 
-config.portlet.title=Enter the portlet title:
+config.portlet.title=Enter the tool title:
 config.portlet.url=Enter the RSS feed URL:
 config.portlet.maxitems=Max items to display:
 
@@ -12,12 +12,12 @@ error.form.readonly.error=Attempt to set value onto readonly field.
 error.form.save.error=Saving your preferences failed.
 
 error.no.remote.data=No data was returned from the remote server. Please ensure the URL added is correct.
-error.no.config=Please configure this portlet
+error.no.config=Please configure this news tool before using.
 
 error.heading.general=An error has occurred
 error.heading.config=Not yet configured
 
-edit.preconfigured=This portlet is mostly pre-configured by the Portal Administrator and cannot be altered, however you can personalise the available settings below.
+edit.preconfigured=This tool is mostly pre-configured by the Portal Administrator and cannot be altered, however you can personalise the available settings below.
 
 view.attachment.default=Attachment
 

diff --git a/...src/main/java/au/edu/anu/portal/portlets/rss/validator/SimpleRSSPreferencesValidator.java b/...src/main/java/au/edu/anu/portal/portlets/rss/validator/SimpleRSSPreferencesValidator.java
@@ -35,16 +35,17 @@
  * @throws ValidatorException if there are any errors
  */
 public class SimpleRSSPreferencesValidator implements PreferencesValidator  {
+	private final String PREF_FEED_URL = "feed_url";
 
 	@Override
 	public void validate(PortletPreferences prefs) throws ValidatorException {
 
 		//get prefs as strings
 		String max_items = prefs.getValue("max_items", Integer.toString(Constants.MAX_ITEMS));
-		String feed_url = prefs.getValue("feed_url", null);
+		String feed_url = prefs.getValue(PREF_FEED_URL, null);
 
 		//check readonly
-		boolean feedUrlIsLocked = prefs.isReadOnly("feed_url");
+		boolean feedUrlIsLocked = prefs.isReadOnly(PREF_FEED_URL);
 
 		/**
 		 * max_items
@@ -73,17 +74,17 @@ public void validate(PortletPreferences prefs) throws ValidatorException {
 
 			//check not null
 			if(StringUtils.isBlank(feed_url)){
-				throw new ValidatorException("You must specify a URL for the RSS feed", Collections.singleton("feed_url"));
+				throw new ValidatorException("You must specify a URL for the RSS feed", Collections.singleton(PREF_FEED_URL));
 			}
 
 		    //check valid scheme
 		    if(!urlValidator.isValidScheme(feed_url)){
-				throw new ValidatorException("Invalid feed scheme. Must be one of: " + Arrays.toString(schemes), Collections.singleton("feed_url"));
+				throw new ValidatorException("Invalid feed scheme. Must be one of: " + Arrays.toString(schemes), Collections.singleton(PREF_FEED_URL));
 		    }
 
 		    //check valid URL
 		    if(!urlValidator.isValid(feed_url)){
-				throw new ValidatorException("Invalid feed URL", Collections.singleton("feed_url"));
+				throw new ValidatorException("Invalid feed URL", Collections.singleton(PREF_FEED_URL));
 
 		    }
 		}

diff --git a/simple-rss-portlet/src/main/webapp/WEB-INF/sakai/simple-rss-portlet.xml b/simple-rss-portlet/src/main/webapp/WEB-INF/sakai/simple-rss-portlet.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0"?>
 <registration>
 
-	<tool id="sakai.simple.rss" title="RSS Portlet" description="For displaying RSS feeds">
+	<tool id="sakai.simple.rss" title="News" description="For viewing content from RSS News Feeds">
 
 		<category name="course" />
 		<category name="project" />
-		<category name="portfolio" />
 		<category name="myworkspace" />
 
 		<configuration name="functions.require" /> 
 		<configuration name="reset.button" value="true"/>
 		<configuration name="allowMultipleInstances" value="true" />
+		<configuration name="feed_url" value="http://sakaiproject.org/feed" />
 
 	</tool>
 

diff --git a/site-manage/site-manage-tool/tool/src/bundle/multipletools.properties b/site-manage/site-manage-tool/tool/src/bundle/multipletools.properties
@@ -1,2 +1,2 @@
-channel-url=URL Channel
+javax.portlet-feed_url=URL Channel
 source=Source
diff --git a/site-manage/site-manage-tool/tool/src/bundle/multipletools_ca.properties b/site-manage/site-manage-tool/tool/src/bundle/multipletools_ca.properties
@@ -1,3 +1,3 @@
 #X-Generator: crowdin.net
-channel-url=Canal URL
+javax.portlet-feed_url=Canal URL
 source=Font
diff --git a/site-manage/site-manage-tool/tool/src/bundle/multipletools_de.properties b/site-manage/site-manage-tool/tool/src/bundle/multipletools_de.properties
@@ -1,2 +1,2 @@
-channel-url=URL-Kanal
+javax.portlet-feed_url=URL-Kanal
 source=Quelle
diff --git a/site-manage/site-manage-tool/tool/src/bundle/multipletools_en_GB.properties b/site-manage/site-manage-tool/tool/src/bundle/multipletools_en_GB.properties
@@ -1,2 +1,2 @@
-channel-url=URL Channel
+javax.portlet-feed_url=URL Channel
 source=Source
diff --git a/site-manage/site-manage-tool/tool/src/bundle/multipletools_es.properties b/site-manage/site-manage-tool/tool/src/bundle/multipletools_es.properties
@@ -1,2 +1,2 @@
-channel-url=Canal URL
+javax.portlet-feed_url=Canal URL
 source=Recurso
diff --git a/site-manage/site-manage-tool/tool/src/bundle/multipletools_eu.properties b/site-manage/site-manage-tool/tool/src/bundle/multipletools_eu.properties
@@ -1,3 +1,3 @@
 #Fri Nov 26 20:32:22 CET 2010
-channel-url=URL kanala
+javax.portlet-feed_url=URL kanala
 source=Baliabidea
diff --git a/site-manage/site-manage-tool/tool/src/bundle/multipletools_hi_IN.properties b/site-manage/site-manage-tool/tool/src/bundle/multipletools_hi_IN.properties
@@ -1,3 +1,3 @@
 #X-Generator: crowdin.net
-channel-url=\u092f\u0942\u0906\u0930\u090f\u0932 \u091a\u0948\u0928\u0932
+javax.portlet-feed_url=\u092f\u0942\u0906\u0930\u090f\u0932 \u091a\u0948\u0928\u0932
 source=\u0938\u094d\u0930\u094b\u0924
diff --git a/site-manage/site-manage-tool/tool/src/bundle/multipletools_it.properties b/site-manage/site-manage-tool/tool/src/bundle/multipletools_it.properties
@@ -1,2 +1,2 @@
-channel-url=Canale URL
+javax.portlet-feed_url=Canale URL
 source=Provenienza
diff --git a/site-manage/site-manage-tool/tool/src/bundle/multipletools_ja.properties b/site-manage/site-manage-tool/tool/src/bundle/multipletools_ja.properties
@@ -1,2 +1,2 @@
-channel-url=URL \u30c1\u30e3\u30f3\u30cd\u30eb
+javax.portlet-feed_url=URL \u30c1\u30e3\u30f3\u30cd\u30eb
 source=\u30bd\u30fc\u30b9
diff --git a/site-manage/site-manage-tool/tool/src/bundle/multipletools_ko.properties b/site-manage/site-manage-tool/tool/src/bundle/multipletools_ko.properties
@@ -1,2 +1,2 @@
-channel-url=URL \ucc44\ub110
+javax.portlet-feed_url=URL \ucc44\ub110
 source=\uc18c\uc2a4
diff --git a/site-manage/site-manage-tool/tool/src/bundle/multipletools_mn.properties b/site-manage/site-manage-tool/tool/src/bundle/multipletools_mn.properties
@@ -3,5 +3,5 @@
 # email: [email protected] #
 ###################################
 
-channel-url=URL-\u044B\u043D \u0441\u0443\u0432\u0430\u0433
+javax.portlet-feed_url=URL-\u044B\u043D \u0441\u0443\u0432\u0430\u0433
 source=\u042D\u0445 \u04AF\u04AF\u0441\u0432\u044D\u0440
diff --git a/site-manage/site-manage-tool/tool/src/bundle/multipletools_pl_PL.properties b/site-manage/site-manage-tool/tool/src/bundle/multipletools_pl_PL.properties
@@ -1,2 +1,2 @@
-channel-url=URL Channel
+javax.portlet-feed_url=URL Channel
 source=\u0179r\u00D3d\u0142o
diff --git a/site-manage/site-manage-tool/tool/src/bundle/multipletools_pt_BR.properties b/site-manage/site-manage-tool/tool/src/bundle/multipletools_pt_BR.properties
@@ -4,5 +4,5 @@
 # TIDIA-Ae Project Fapesp, Sao Paulo, Brazil
 #-------------------------------------------------------------------------------
 
-channel-url=Canal de URL
+javax.portlet-feed_url=Canal de URL
 source=Fonte
diff --git a/site-manage/site-manage-tool/tool/src/bundle/multipletools_tr_TR.properties b/site-manage/site-manage-tool/tool/src/bundle/multipletools_tr_TR.properties
@@ -1,2 +1,2 @@
-channel-url=URL Kanal\u0131
+javax.portlet-feed_url=URL Kanal\u0131
 source=Kaynak
diff --git a/site-manage/site-manage-tool/tool/src/bundle/multipletools_zh_CN.properties b/site-manage/site-manage-tool/tool/src/bundle/multipletools_zh_CN.properties
@@ -1,2 +1,2 @@
-channel-url=URL\u5730\u5740
+javax.portlet-feed_url=URL\u5730\u5740
 source=\u5916\u90E8\u7F51\u7AD9\u5730\u5740
diff --git a/site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java b/site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java
@@ -737,8 +737,8 @@ public class SiteAction extends PagedResourceActionII {
 	private final static String WEB_CONTENT_TOOL_SOURCE_CONFIG_VALUE = "http://";
 
 	/** the news tool **/
-	private final static String NEWS_TOOL_ID = "sakai.news";
-	private final static String NEWS_TOOL_CHANNEL_CONFIG = "channel-url";
+	private final static String NEWS_TOOL_ID = "sakai.simple.rss";
+	private final static String NEWS_TOOL_CHANNEL_CONFIG = "javax.portlet-feed_url";
 	private final static String NEWS_TOOL_CHANNEL_CONFIG_VALUE = "http://sakaiproject.org/feed";
 
    	private final static String LESSONS_TOOL_ID = "sakai.lessonbuildertool";

diff --git a/web/news-api/api/pom.xml b/web/news-api/api/pom.xml