June 2008 - Nuiton-rss-commits - mailman.cloud.codelutin.com

[Lutinweb-commits] r89 - trunk/lutinrss
by tchemit＠users.labs.libre-entreprise.org June 30, 2008

June 30, 2008

Author: tchemit Date: 2008-06-30 16:06:27 +0000 (Mon, 30 Jun 2008) New Revision: 89 Modified: trunk/lutinrss/pom.xml Log: make update feed works on blog :)make update feed works (todo unit test...) Modified: trunk/lutinrss/pom.xml =================================================================== --- trunk/lutinrss/pom.xml 2008-06-30 14:41:23 UTC (rev 88) +++ trunk/lutinrss/pom.xml 2008-06-30 16:06:27 UTC (rev 89) @@ -24,7 +24,7 @@ <packaging>war</packaging>  - <version>2.3.4</version> + <version>2.3.5</version>  <description>Servlet pouvant etre appeler depuis du JS pour recuperer un

1 0

[Lutinweb-commits] r88 - trunk/lutinrss/src/main/java/org/codelutin/rss
by tchemit＠users.labs.libre-entreprise.org June 30, 2008

June 30, 2008

Author: tchemit Date: 2008-06-30 14:41:23 +0000 (Mon, 30 Jun 2008) New Revision: 88 Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/RSSGenerator.java Log: make update feed works (todo unit test...) Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/RSSGenerator.java =================================================================== --- trunk/lutinrss/src/main/java/org/codelutin/rss/RSSGenerator.java 2008-06-23 16:24:21 UTC (rev 87) +++ trunk/lutinrss/src/main/java/org/codelutin/rss/RSSGenerator.java 2008-06-30 14:41:23 UTC (rev 88) @@ -220,10 +220,9 @@ FileLock lock = acquireLock(f); try { - // get feed - SyndFeed feed = RSSIOUtil.readFeed(url); - RSSIOUtil.updateFeed(url,feedProperties, values); + // get updated nfeed + SyndFeed feed = RSSIOUtil.updateFeed(url,feedProperties, values); // save feed into a tmp file File tmpFile = new File(f.getAbsolutePath() + "-tmp_" + System.nanoTime());

1 0

[Lutinweb-commits] r87 - in trunk/lutinrss: . src/main/java/org/codelutin/rss
by tchemit＠users.labs.libre-entreprise.org June 23, 2008

June 23, 2008

Author: tchemit Date: 2008-06-23 16:24:21 +0000 (Mon, 23 Jun 2008) New Revision: 87 Modified: trunk/lutinrss/pom.xml trunk/lutinrss/src/main/java/org/codelutin/rss/RSSGenerator.java trunk/lutinrss/src/main/java/org/codelutin/rss/RSSIOUtil.java Log: add updateFeed fonction Modified: trunk/lutinrss/pom.xml =================================================================== --- trunk/lutinrss/pom.xml 2008-06-09 14:47:31 UTC (rev 86) +++ trunk/lutinrss/pom.xml 2008-06-23 16:24:21 UTC (rev 87) @@ -24,7 +24,7 @@ <packaging>war</packaging>  - <version>2.3.3</version> + <version>2.3.4</version>  <description>Servlet pouvant etre appeler depuis du JS pour recuperer un Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/RSSGenerator.java =================================================================== --- trunk/lutinrss/src/main/java/org/codelutin/rss/RSSGenerator.java 2008-06-09 14:47:31 UTC (rev 86) +++ trunk/lutinrss/src/main/java/org/codelutin/rss/RSSGenerator.java 2008-06-23 16:24:21 UTC (rev 87) @@ -130,7 +130,7 @@ try { SyndFeed feed = RSSIOUtil.createFeed(feedProperties, type, values); - + RSSIOUtil.saveFeed(f, feed); } catch (FeedException e) { @@ -194,7 +194,7 @@ releaseLock(f, lock); } } - + public void deleteFeedFile(URL toURL) { File f = getFile(toURL); if (f.exists() && !f.delete()) { @@ -202,6 +202,41 @@ } } + public void updateFeed(URL url,Map<Field,Object> values) throws IOException, FeedException, ParseException { + if (url == null) { + throw new NullPointerException("can not add a feed's entry with null url"); + } + if (values == null || values.isEmpty()) { + //TODO Should check mandatory values (title, link,...) + throw new NullPointerException("can not add a feed's entry with null nor empty values dictonnary"); + } + File f = getFile(url); + + if (!f.exists()) { + throw new FileNotFoundException("file not existing " + f); + } + + // block until can acquire lock + FileLock lock = acquireLock(f); + + try { + // get feed + SyndFeed feed = RSSIOUtil.readFeed(url); + + RSSIOUtil.updateFeed(url,feedProperties, values); + + // save feed into a tmp file + File tmpFile = new File(f.getAbsolutePath() + "-tmp_" + System.nanoTime()); + + RSSIOUtil.saveFeed(tmpFile, feed); + + // move tmpFile to real file + tmpFile.renameTo(f); + } finally { + releaseLock(f, lock); + } + } + public FeedType getFormat() { return format; } Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/RSSIOUtil.java =================================================================== --- trunk/lutinrss/src/main/java/org/codelutin/rss/RSSIOUtil.java 2008-06-09 14:47:31 UTC (rev 86) +++ trunk/lutinrss/src/main/java/org/codelutin/rss/RSSIOUtil.java 2008-06-23 16:24:21 UTC (rev 87) @@ -76,46 +76,15 @@ SyndFeed feed = new SyndFeedImpl(); feed.setFeedType(type.getType()); feed.setEncoding("utf-8"); - for (Entry<Field, Object> entry : values.entrySet()) { - Field field = entry.getKey(); - String name = feedProperties.get(field); - if (name == null) { - // this field is not managed - log.warn("the field " + field + " is not managed in feed"); - continue; - } - Object value = entry.getValue(); - Object realValue; - switch (field) { - case TIME: - realValue = RSSGenerator.DATE_PARSER.parse((String) value); - break; - case CATEGORY: - List<String> categoriesAsString = new java.util.ArrayList<String>(); - if (value instanceof List) { - categoriesAsString = (List) value; - } else { - // categories as String - String cats = String.valueOf(value); - String[] categories = cats.split(RSSGeneratorConfig.DEFAULT_LIST_SEPARATOR); - categoriesAsString = java.util.Arrays.asList(categories); - } - realValue = new java.util.ArrayList<SyndCategory>(); - for (String cat : categoriesAsString) { - SyndCategory scat = new SyndCategoryImpl(); - scat.setName(cat); - ((List)realValue).add(scat); - } - break; - default: - realValue = value; - } - - setFieldValue(feed, name, realValue); - } - + fillFeed(values, feedProperties, feed); return feed; } + + public static SyndFeed updateFeed(URL url,EnumMap<Field, String> feedProperties, Map<Field, Object> values) throws ParseException, IllegalArgumentException, FeedException, IOException { + SyndFeed feed = RSSIOUtil.readFeed(url); + fillFeed(values, feedProperties, feed); + return feed; + } @SuppressWarnings({"unchecked"}) protected static SyndFeed addItemToFeed(SyndFeed feed, SyndEntry item, int nbEntries, Map<Field, Object> values) throws IOException, IllegalArgumentException, FeedException, ParseException { @@ -169,6 +138,47 @@ return feedEntry; } + protected static void fillFeed(Map<Field, Object> values, EnumMap<Field, String> feedProperties, SyndFeed feed) throws ParseException { + + for (Entry<Field, Object> entry : values.entrySet()) { + Field field = entry.getKey(); + String name = feedProperties.get(field); + if (name == null) { + // this field is not managed + log.warn("the field " + field + " is not managed in feed"); + continue; + } + Object value = entry.getValue(); + Object realValue; + switch (field) { + case TIME: + realValue = RSSGenerator.DATE_PARSER.parse((String) value); + break; + case CATEGORY: + List<String> categoriesAsList = new java.util.ArrayList<String>(); + if (value instanceof List) { + categoriesAsList = (List) value; + } else { + // categories as String + String cats = String.valueOf(value); + String[] categories = cats.split(RSSGeneratorConfig.DEFAULT_LIST_SEPARATOR); + categoriesAsList = java.util.Arrays.asList(categories); + } + realValue = new java.util.ArrayList<SyndCategory>(); + for (String cat : categoriesAsList) { + SyndCategory scat = new SyndCategoryImpl(); + scat.setName(cat); + ((List) realValue).add(scat); + } + break; + default: + realValue = value; + } + + setFieldValue(feed, name, realValue); + } + } + protected static void setFieldValue(Object dst, String name, Object value) { if (value == null) { // null value is not managed

1 0

[Lutinweb-commits] r86 - in trunk/lutinrss: . src/main/java/org/codelutin/rss
by tchemit＠users.labs.libre-entreprise.org June 9, 2008

June 9, 2008

Author: tchemit Date: 2008-06-09 14:47:31 +0000 (Mon, 09 Jun 2008) New Revision: 86 Modified: trunk/lutinrss/pom.xml trunk/lutinrss/src/main/java/org/codelutin/rss/RSSGenerator.java Log: version 2.3.3 : nbItems is a field of RSSGenerator Modified: trunk/lutinrss/pom.xml =================================================================== --- trunk/lutinrss/pom.xml 2008-06-05 20:20:27 UTC (rev 85) +++ trunk/lutinrss/pom.xml 2008-06-09 14:47:31 UTC (rev 86) @@ -24,7 +24,7 @@ <packaging>war</packaging>  - <version>2.3.2</version> + <version>2.3.3</version>  <description>Servlet pouvant etre appeler depuis du JS pour recuperer un Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/RSSGenerator.java =================================================================== --- trunk/lutinrss/src/main/java/org/codelutin/rss/RSSGenerator.java 2008-06-05 20:20:27 UTC (rev 85) +++ trunk/lutinrss/src/main/java/org/codelutin/rss/RSSGenerator.java 2008-06-09 14:47:31 UTC (rev 86) @@ -55,16 +55,19 @@ protected final File generatorDirectory; /** feed format to use **/ protected final FeedType format; + /** number of feed to use by default */ + protected final int nbItems; protected RSSGenerator() { this(null); } - protected RSSGenerator(EnumMap<Field, String> feedProperties, EnumMap<Field, String> itemProperties, File generatorDirectory,FeedType format) { + protected RSSGenerator(EnumMap<Field, String> feedProperties, EnumMap<Field, String> itemProperties, File generatorDirectory,FeedType format,int nbItems) { this.feedProperties = feedProperties; this.itemProperties = itemProperties; this.generatorDirectory = generatorDirectory; this.format=format; + this.nbItems=nbItems; } protected RSSGenerator(File generatorDirectory) { @@ -89,6 +92,7 @@ this.generatorDirectory = generatorDirectory==null?new File(RSSGeneratorConfig.GENERATOR_DIRECTORY):generatorDirectory; this.format=FeedType.valueOf(RSSGeneratorConfig.DEFAULT_GENERATOR_FORMAT); + this.nbItems = RSSGeneratorConfig.DEFAULT_GENERATOR_NB_ITEM; } /** @@ -205,6 +209,10 @@ public File getFeedFile(String name) { return new File(getGeneratorDirectory(),name+".xml"); } + + public int getNbItems() { + return nbItems; + } /** * Obtain the file from his url location.

1 0

[Lutinweb-commits] r85 - in trunk/lutinrss: . src/main/java/org/codelutin/rss src/test/java/org/codelutin/rss
by tchemit＠users.labs.libre-entreprise.org June 5, 2008

June 5, 2008

Author: tchemit Date: 2008-06-05 20:20:27 +0000 (Thu, 05 Jun 2008) New Revision: 85 Modified: trunk/lutinrss/pom.xml trunk/lutinrss/src/main/java/org/codelutin/rss/RSSGenerator.java trunk/lutinrss/src/test/java/org/codelutin/rss/RSSGeneratorHelperTest.java Log: lutinrss-2.3.2 : ajout methode dans RSSGenerator getFeedFile Modified: trunk/lutinrss/pom.xml =================================================================== --- trunk/lutinrss/pom.xml 2008-06-05 15:36:29 UTC (rev 84) +++ trunk/lutinrss/pom.xml 2008-06-05 20:20:27 UTC (rev 85) @@ -24,7 +24,7 @@ <packaging>war</packaging>  - <version>2.3.1</version> + <version>2.3.2</version>  <description>Servlet pouvant etre appeler depuis du JS pour recuperer un Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/RSSGenerator.java =================================================================== --- trunk/lutinrss/src/main/java/org/codelutin/rss/RSSGenerator.java 2008-06-05 15:36:29 UTC (rev 84) +++ trunk/lutinrss/src/main/java/org/codelutin/rss/RSSGenerator.java 2008-06-05 20:20:27 UTC (rev 85) @@ -200,7 +200,12 @@ public FeedType getFormat() { return format; - } + } + + public File getFeedFile(String name) { + return new File(getGeneratorDirectory(),name+".xml"); + } + /** * Obtain the file from his url location. * Modified: trunk/lutinrss/src/test/java/org/codelutin/rss/RSSGeneratorHelperTest.java =================================================================== --- trunk/lutinrss/src/test/java/org/codelutin/rss/RSSGeneratorHelperTest.java 2008-06-05 15:36:29 UTC (rev 84) +++ trunk/lutinrss/src/test/java/org/codelutin/rss/RSSGeneratorHelperTest.java 2008-06-05 20:20:27 UTC (rev 85) @@ -187,7 +187,7 @@ } protected File getFeedFile() { - return new File(helper.getGeneratorDirectory(), getClass().getSimpleName() + "-" + System.nanoTime() + ".xml"); + return helper.getFeedFile(getClass().getSimpleName() + "-" + System.nanoTime()); } protected Map<Field, Object> createEntry(int number) throws MalformedURLException {

1 0

[Lutinweb-commits] r84 - trunk/lutinrss
by tchemit＠users.labs.libre-entreprise.org June 5, 2008

June 5, 2008

Author: tchemit Date: 2008-06-05 15:36:29 +0000 (Thu, 05 Jun 2008) New Revision: 84 Modified: trunk/lutinrss/pom.xml Log: public access to DATE_PARSER Modified: trunk/lutinrss/pom.xml =================================================================== --- trunk/lutinrss/pom.xml 2008-06-05 15:36:13 UTC (rev 83) +++ trunk/lutinrss/pom.xml 2008-06-05 15:36:29 UTC (rev 84) @@ -24,7 +24,7 @@ <packaging>war</packaging>  - <version>2.3</version> + <version>2.3.1</version>  <description>Servlet pouvant etre appeler depuis du JS pour recuperer un

1 0

[Lutinweb-commits] r83 - trunk/lutinrss/src/main/java/org/codelutin/rss
by tchemit＠users.labs.libre-entreprise.org June 5, 2008

June 5, 2008

Author: tchemit Date: 2008-06-05 15:36:13 +0000 (Thu, 05 Jun 2008) New Revision: 83 Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/RSSGenerator.java Log: public access to DATE_PARSER Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/RSSGenerator.java =================================================================== --- trunk/lutinrss/src/main/java/org/codelutin/rss/RSSGenerator.java 2008-06-04 11:35:29 UTC (rev 82) +++ trunk/lutinrss/src/main/java/org/codelutin/rss/RSSGenerator.java 2008-06-05 15:36:13 UTC (rev 83) @@ -33,7 +33,7 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ static final Log log = LogFactory.getLog(RSSGenerator.class); /** date formater use to save date in feed and entries */ - static final DateFormat DATE_PARSER = new SimpleDateFormat("dd/MM/yyyy hh:mm:ss"); + public static final DateFormat DATE_PARSER = new SimpleDateFormat("dd/MM/yyyy hh:mm:ss"); /** *

1 0

[Lutinweb-commits] r82 - in trunk/lutinrss: . src/main/java/org/codelutin/rss src/main/webapp src/test/java/org/codelutin/rss
by tchemit＠users.labs.libre-entreprise.org June 4, 2008

June 4, 2008

Author: tchemit Date: 2008-06-04 11:35:29 +0000 (Wed, 04 Jun 2008) New Revision: 82 Modified: trunk/lutinrss/pom.xml trunk/lutinrss/src/main/java/org/codelutin/rss/Field.java trunk/lutinrss/src/main/java/org/codelutin/rss/RSSGenerator.java trunk/lutinrss/src/main/java/org/codelutin/rss/RSSGeneratorConfig.java trunk/lutinrss/src/main/java/org/codelutin/rss/RSSGeneratorServlet.java trunk/lutinrss/src/main/java/org/codelutin/rss/RSSIOUtil.java trunk/lutinrss/src/main/webapp/testGenerator.html trunk/lutinrss/src/test/java/org/codelutin/rss/RSSGeneratorHelperTest.java Log: ajout des catagories dans le feed (unqiuement pour la g?\195?\169n?\195?\169ration pour le moment) Modified: trunk/lutinrss/pom.xml =================================================================== --- trunk/lutinrss/pom.xml 2008-06-04 09:04:35 UTC (rev 81) +++ trunk/lutinrss/pom.xml 2008-06-04 11:35:29 UTC (rev 82) @@ -24,7 +24,7 @@ <packaging>war</packaging>  - <version>2.2</version> + <version>2.3</version>  <description>Servlet pouvant etre appeler depuis du JS pour recuperer un Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/Field.java =================================================================== --- trunk/lutinrss/src/main/java/org/codelutin/rss/Field.java 2008-06-04 09:04:35 UTC (rev 81) +++ trunk/lutinrss/src/main/java/org/codelutin/rss/Field.java 2008-06-04 11:35:29 UTC (rev 82) @@ -12,7 +12,7 @@ */ public enum Field { - NAME('n'), IMAGE('i'), DESCRIPTION('d'), AUTHOR('a'), TIME('t'),LINK('l'); + NAME('n'), IMAGE('i'), DESCRIPTION('d'), AUTHOR('a'), TIME('t'),LINK('l'),CATEGORY('c'); /** le caractere utilise pour la version compactee d'une configuration de renderer */ private char c; Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/RSSGenerator.java =================================================================== --- trunk/lutinrss/src/main/java/org/codelutin/rss/RSSGenerator.java 2008-06-04 09:04:35 UTC (rev 81) +++ trunk/lutinrss/src/main/java/org/codelutin/rss/RSSGenerator.java 2008-06-04 11:35:29 UTC (rev 82) @@ -77,6 +77,7 @@ feedProperties.put(Field.DESCRIPTION, "description"); feedProperties.put(Field.AUTHOR, "author"); feedProperties.put(Field.TIME, "publishedDate"); + feedProperties.put(Field.CATEGORY, "categories"); itemProperties = new EnumMap<Field, String>(Field.class); itemProperties.put(Field.NAME, "title"); Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/RSSGeneratorConfig.java =================================================================== --- trunk/lutinrss/src/main/java/org/codelutin/rss/RSSGeneratorConfig.java 2008-06-04 09:04:35 UTC (rev 81) +++ trunk/lutinrss/src/main/java/org/codelutin/rss/RSSGeneratorConfig.java 2008-06-04 11:35:29 UTC (rev 82) @@ -12,10 +12,14 @@ * la propriete de configuration qui definit le prefix a jouter pour scruter la configuration */ private static final String CONFIGURATION_PREFIX_PROPERTY = RSSGeneratorServlet.class.getSimpleName() + "_configuration_prefix"; - + /** nombre d'items max à ecrire dans le fichier du flux */ public static int DEFAULT_GENERATOR_NB_ITEM = 100; + /** le format par défaut duflux à générer */ public static String DEFAULT_GENERATOR_FORMAT = "RSS_2_0"; + /** le répertoire où générer les flux */ public static String GENERATOR_DIRECTORY = "/tmp/rssinclude"; + /** le caractère séparateur des listes de métas (categorie par exemple) */ + public static String DEFAULT_LIST_SEPARATOR = ";"; public void setDEFAULT_GENERATOR_NB_ITEM(int DEFAULT_GENERATOR_NB_ITEM) { RSSGeneratorConfig.DEFAULT_GENERATOR_NB_ITEM = DEFAULT_GENERATOR_NB_ITEM; @@ -29,6 +33,9 @@ RSSGeneratorConfig.GENERATOR_DIRECTORY = GENERATOR_DIRECTORY; } + public void setDEFAULT_LIST_SEPARATOR(String DEFAULT_LIST_SEPARATOR) { + RSSGeneratorConfig.DEFAULT_LIST_SEPARATOR = DEFAULT_LIST_SEPARATOR; + } /** * * @param S la classe source de la configuration @@ -45,6 +52,7 @@ super.init(CONFIGURATION_PREFIX_PROPERTY,RSSGeneratorConfig.class, config, "DEFAULT_GENERATOR_NB_ITEM", "DEFAULT_GENERATOR_FORMAT", + "DEFAULT_LIST_SEPARATOR", "GENERATOR_DIRECTORY"); // create delegate directory Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/RSSGeneratorServlet.java =================================================================== --- trunk/lutinrss/src/main/java/org/codelutin/rss/RSSGeneratorServlet.java 2008-06-04 09:04:35 UTC (rev 81) +++ trunk/lutinrss/src/main/java/org/codelutin/rss/RSSGeneratorServlet.java 2008-06-04 11:35:29 UTC (rev 82) @@ -36,11 +36,13 @@ String description = request.getParameter("feedDescription"); String link = request.getParameter("feedLink"); String author = request.getParameter("feedAuthor"); + String categories = request.getParameter("feedCategories"); Map<Field, Object> values = new HashMap<Field, Object>(); values.put(Field.NAME, feedName); addFieldValue(Field.DESCRIPTION, description, values); addFieldValue(Field.LINK, link, values); addFieldValue(Field.AUTHOR, author, values); + addFieldValue(Field.CATEGORY, categories, values); values.put(Field.TIME, RSSGenerator.DATE_PARSER.format(new java.util.Date())); try { delegate.createFeedFile(file.toURI().toURL(), feedType, values); Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/RSSIOUtil.java =================================================================== --- trunk/lutinrss/src/main/java/org/codelutin/rss/RSSIOUtil.java 2008-06-04 09:04:35 UTC (rev 81) +++ trunk/lutinrss/src/main/java/org/codelutin/rss/RSSIOUtil.java 2008-06-04 11:35:29 UTC (rev 82) @@ -1,5 +1,7 @@ package org.codelutin.rss; +import com.sun.syndication.feed.synd.SyndCategory; +import com.sun.syndication.feed.synd.SyndCategoryImpl; import com.sun.syndication.feed.synd.SyndContent; import com.sun.syndication.feed.synd.SyndContentImpl; import com.sun.syndication.feed.synd.SyndEntry; @@ -88,6 +90,23 @@ case TIME: realValue = RSSGenerator.DATE_PARSER.parse((String) value); break; + case CATEGORY: + List<String> categoriesAsString = new java.util.ArrayList<String>(); + if (value instanceof List) { + categoriesAsString = (List) value; + } else { + // categories as String + String cats = String.valueOf(value); + String[] categories = cats.split(RSSGeneratorConfig.DEFAULT_LIST_SEPARATOR); + categoriesAsString = java.util.Arrays.asList(categories); + } + realValue = new java.util.ArrayList<SyndCategory>(); + for (String cat : categoriesAsString) { + SyndCategory scat = new SyndCategoryImpl(); + scat.setName(cat); + ((List)realValue).add(scat); + } + break; default: realValue = value; } Modified: trunk/lutinrss/src/main/webapp/testGenerator.html =================================================================== --- trunk/lutinrss/src/main/webapp/testGenerator.html 2008-06-04 09:04:35 UTC (rev 81) +++ trunk/lutinrss/src/main/webapp/testGenerator.html 2008-06-04 11:35:29 UTC (rev 82) @@ -10,7 +10,7 @@ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> <style type="text/css"> .error {color:red; display:block;} - fieldset {height:120px;} + fieldset {height:140px;} iframe { width:100%;height:400px;} </style> <script src="rssgenerator.js"></script> @@ -57,6 +57,10 @@ <td>feedAuthor : </td> <td><input name="feedAuthor" type="text" size="50"></td> </tr> + <tr> + <td>feedCategories : </td> + <td><input name="feedCategories" type="text" size="50"></td> + </tr> <tr><td style="font-size:11px">(*)  Mandatory field</td></tr> </table> </fieldset> Modified: trunk/lutinrss/src/test/java/org/codelutin/rss/RSSGeneratorHelperTest.java =================================================================== --- trunk/lutinrss/src/test/java/org/codelutin/rss/RSSGeneratorHelperTest.java 2008-06-04 09:04:35 UTC (rev 81) +++ trunk/lutinrss/src/test/java/org/codelutin/rss/RSSGeneratorHelperTest.java 2008-06-04 11:35:29 UTC (rev 82) @@ -4,6 +4,7 @@ */ package org.codelutin.rss; +import com.sun.syndication.feed.synd.SyndCategory; import com.sun.syndication.feed.synd.SyndEntry; import com.sun.syndication.feed.synd.SyndFeed; import java.io.File; @@ -43,6 +44,8 @@ values.put(Field.NAME, "feedName : " + f.getName()); values.put(Field.DESCRIPTION, "feedDescription : " + f.getName()); values.put(Field.LINK, f.toURI().toURL() + ""); + values.put(Field.AUTHOR, "feed author"); + values.put(Field.CATEGORY, java.util.Arrays.asList("categorie1","categorie2")); values.put(Field.TIME, RSSGenerator.DATE_PARSER.format(new java.util.Date())); assertFalse(f.exists()); @@ -63,6 +66,12 @@ assertEquals(feed.getLink(), values.get(Field.LINK)); assertEquals(feed.getTitle(), values.get(Field.NAME)); assertEquals(feed.getDescription(), values.get(Field.DESCRIPTION)); + assertEquals(feed.getAuthor(), values.get(Field.AUTHOR)); + List cats = (List) values.get(Field.CATEGORY); + for (Object o : feed.getCategories()) { + SyndCategory cat = (SyndCategory) o; + assertTrue(cats.contains(cat.getName())); + } assertEquals(feed.getPublishedDate(), RSSGenerator.DATE_PARSER.parse((String) values.get(Field.TIME))); } @@ -173,6 +182,7 @@ assertEquals(entry.getLink(), values.get(Field.LINK)); assertEquals(entry.getTitle(), values.get(Field.NAME)); assertEquals(entry.getDescription().getValue(), values.get(Field.DESCRIPTION)); + assertEquals(entry.getAuthor(), values.get(Field.AUTHOR)); assertEquals(entry.getPublishedDate(), RSSGenerator.DATE_PARSER.parse((String) values.get(Field.TIME))); } @@ -184,6 +194,7 @@ Map<Field, Object> values = new java.util.HashMap<Field, Object>(); values.put(Field.NAME, "entryName : " + f.getName() + "-" + number); values.put(Field.DESCRIPTION, "entryDescription : " + f.getName() + "-" + number); + values.put(Field.AUTHOR, "author-" + number); values.put(Field.LINK, f.toURI().toURL() + "/entry-" + number); values.put(Field.TIME, RSSGenerator.DATE_PARSER.format(new java.util.Date())); return values;

1 0

[Lutinweb-commits] r81 - trunk/lutinrss
by tchemit＠users.labs.libre-entreprise.org June 4, 2008

June 4, 2008

Author: tchemit Date: 2008-06-04 09:04:35 +0000 (Wed, 04 Jun 2008) New Revision: 81 Modified: trunk/lutinrss/pom.xml Log: harmonisation des dependances Modified: trunk/lutinrss/pom.xml =================================================================== --- trunk/lutinrss/pom.xml 2008-06-02 19:51:41 UTC (rev 80) +++ trunk/lutinrss/pom.xml 2008-06-04 09:04:35 UTC (rev 81) @@ -48,13 +48,13 @@ <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> - <version>1.1</version> + <version>1.1.1</version> <scope>compile</scope> </dependency> <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> - <version>3.2</version> + <version>3.2.1</version> <scope>compile</scope> </dependency> <dependency> @@ -76,7 +76,7 @@ <scope>compile</scope> </dependency> -  +  <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId>

1 0

[Lutinweb-commits] r80 - in trunk/lutinrss: . src/main/java/org/codelutin/rss src/test/java/org/codelutin/rss
by tchemit＠users.labs.libre-entreprise.org June 2, 2008

June 2, 2008

Author: tchemit Date: 2008-06-02 19:51:41 +0000 (Mon, 02 Jun 2008) New Revision: 80 Modified: trunk/lutinrss/pom.xml trunk/lutinrss/src/main/java/org/codelutin/rss/RSSGenerator.java trunk/lutinrss/src/main/java/org/codelutin/rss/RSSGeneratorServlet.java trunk/lutinrss/src/test/java/org/codelutin/rss/RSSGeneratorHelperTest.java Log: utilisation propri?\195?\169t?\195?\169 String au lieu de FeedType + setter en non statique, sinon BeanUtils ne fonctionne pas Modified: trunk/lutinrss/pom.xml =================================================================== --- trunk/lutinrss/pom.xml 2008-06-02 19:50:57 UTC (rev 79) +++ trunk/lutinrss/pom.xml 2008-06-02 19:51:41 UTC (rev 80) @@ -24,7 +24,7 @@ <packaging>war</packaging>  - <version>2.2-SNAPSHOT</version> + <version>2.2</version>  <description>Servlet pouvant etre appeler depuis du JS pour recuperer un Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/RSSGenerator.java =================================================================== --- trunk/lutinrss/src/main/java/org/codelutin/rss/RSSGenerator.java 2008-06-02 19:50:57 UTC (rev 79) +++ trunk/lutinrss/src/main/java/org/codelutin/rss/RSSGenerator.java 2008-06-02 19:51:41 UTC (rev 80) @@ -53,15 +53,18 @@ protected final EnumMap<Field, String> itemProperties; /** directory where feeds are stored */ protected final File generatorDirectory; - + /** feed format to use **/ + protected final FeedType format; + protected RSSGenerator() { this(null); } - protected RSSGenerator(EnumMap<Field, String> feedProperties, EnumMap<Field, String> itemProperties, File generatorDirectory) { + protected RSSGenerator(EnumMap<Field, String> feedProperties, EnumMap<Field, String> itemProperties, File generatorDirectory,FeedType format) { this.feedProperties = feedProperties; this.itemProperties = itemProperties; this.generatorDirectory = generatorDirectory; + this.format=format; } protected RSSGenerator(File generatorDirectory) { @@ -84,6 +87,7 @@ itemProperties.put(Field.TIME, "publishedDate"); this.generatorDirectory = generatorDirectory==null?new File(RSSGeneratorConfig.GENERATOR_DIRECTORY):generatorDirectory; + this.format=FeedType.valueOf(RSSGeneratorConfig.DEFAULT_GENERATOR_FORMAT); } /** @@ -193,6 +197,9 @@ } } + public FeedType getFormat() { + return format; + } /** * Obtain the file from his url location. * Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/RSSGeneratorServlet.java =================================================================== --- trunk/lutinrss/src/main/java/org/codelutin/rss/RSSGeneratorServlet.java 2008-06-02 19:50:57 UTC (rev 79) +++ trunk/lutinrss/src/main/java/org/codelutin/rss/RSSGeneratorServlet.java 2008-06-02 19:51:41 UTC (rev 80) @@ -22,7 +22,17 @@ public void doCreateFeed(HttpServletRequest request, HttpServletResponse response, String feedName, File file) throws ServletException, IOException { String type = request.getParameter("feedType"); - FeedType feedType = type != null ? FeedType.valueOf(type) : RSSGeneratorConfig.DEFAULT_GENERATOR_FORMAT; + FeedType feedType = null; + if (type != null) { + try { + feedType = FeedType.valueOf(type); + } catch (Exception e) { + feedType = null; + } + } + if (feedType == null) { + feedType = delegate.getFormat(); + } String description = request.getParameter("feedDescription"); String link = request.getParameter("feedLink"); String author = request.getParameter("feedAuthor"); @@ -59,7 +69,7 @@ public void doAddItem(HttpServletRequest request, HttpServletResponse response, String feedName, File file) throws ServletException, IOException { - Integer nbItems = convertToInt(request.getParameter("nbItems")); + Integer nbItems = convertToInt(request.getParameter("nbItems")); if (nbItems == null) { nbItems = RSSGeneratorConfig.DEFAULT_GENERATOR_NB_ITEM; } @@ -132,7 +142,7 @@ } @Override - protected ConfigInitializer<ServletConfig,?> newConfigInitializer() { + protected ConfigInitializer<ServletConfig, ?> newConfigInitializer() { return new RSSGeneratorConfig.RssGeneratorConfigInitializer<ServletConfig>() { protected String getConfigValue(ServletConfig config, String fullConfigName) { Modified: trunk/lutinrss/src/test/java/org/codelutin/rss/RSSGeneratorHelperTest.java =================================================================== --- trunk/lutinrss/src/test/java/org/codelutin/rss/RSSGeneratorHelperTest.java 2008-06-02 19:50:57 UTC (rev 79) +++ trunk/lutinrss/src/test/java/org/codelutin/rss/RSSGeneratorHelperTest.java 2008-06-02 19:51:41 UTC (rev 80) @@ -47,7 +47,7 @@ assertFalse(f.exists()); RSSGenerator.log.info("feedFile : " + f); - helper.createFeedFile(f.toURI().toURL(), RSSGeneratorConfig.DEFAULT_GENERATOR_FORMAT, values); + helper.createFeedFile(f.toURI().toURL(), helper.getFormat(), values); // no lock assertFalse(helper.getWriteFileLock(f).exists()); // file exist @@ -59,7 +59,7 @@ RSSGenerator.log.debug(feed); } - assertEquals(feed.getFeedType(), RSSGeneratorConfig.DEFAULT_GENERATOR_FORMAT.getType()); + assertEquals(feed.getFeedType(), helper.getFormat().getType()); assertEquals(feed.getLink(), values.get(Field.LINK)); assertEquals(feed.getTitle(), values.get(Field.NAME)); assertEquals(feed.getDescription(), values.get(Field.DESCRIPTION)); @@ -78,7 +78,7 @@ assertTrue(f.exists()); try { - helper.createFeedFile(f.toURI().toURL(), RSSGeneratorConfig.DEFAULT_GENERATOR_FORMAT, values); + helper.createFeedFile(f.toURI().toURL(), helper.getFormat(), values); // file already exist, can not reach this code fail(); } catch (IllegalStateException e) {

1 0