Author: tchemit Date: 2008-05-31 19:08:24 +0000 (Sat, 31 May 2008) New Revision: 78 Added: trunk/lutinrss/src/main/webapp/index.html trunk/lutinrss/src/main/webapp/testFck.html trunk/lutinrss/src/main/webapp/testRender.html Removed: trunk/lutinrss/src/main/webapp/fckTest.html trunk/lutinrss/src/main/webapp/test.html Modified: trunk/lutinrss/pom.xml trunk/lutinrss/src/main/webapp/rssgenerator.js trunk/lutinrss/src/main/webapp/testGenerator.html trunk/lutinrss/src/test/java/org/codelutin/rss/RSSGeneratorHelperTest.java Log: add test index pages Modified: trunk/lutinrss/pom.xml =================================================================== --- trunk/lutinrss/pom.xml 2008-05-31 16:34:27 UTC (rev 77) +++ trunk/lutinrss/pom.xml 2008-05-31 19:08:24 UTC (rev 78) @@ -4,14 +4,6 @@ <!--The version of maven's project object model--> <modelVersion>4.0.0</modelVersion> - <!--lutinproject.xml--> -<!-- - <parent> - <groupId>lutinlib</groupId> - <artifactId>lutinproject</artifactId> - <version>2.2</version> - </parent> ---> <distributionManagement> <site> <id>labs</id> @@ -32,7 +24,7 @@ <packaging>war</packaging> <!--Version--> - <version>2.1</version> + <version>2.2-SNAPSHOT</version> <!--Description--> <description>Servlet pouvant etre appeler depuis du JS pour recuperer un @@ -98,8 +90,8 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <source>1.5</source> - <target>1.5</target> + <source>${maven.compile.source}</source> + <target>${maven.compile.target}</target> </configuration> </plugin> <plugin> @@ -137,6 +129,14 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <!--warName>lutinrss</warName--> + <webappDirectory>target/lutinrss</webappDirectory> + </configuration> + </plugin> </plugins> </build> <profiles> @@ -146,7 +146,6 @@ <activeByDefault>true</activeByDefault> </activation> <properties> - <maven.test.skip>false</maven.test.skip> <maven.compile.source>1.5</maven.compile.source> <maven.compile.target>1.5</maven.compile.target> </properties> @@ -158,8 +157,4 @@ </pluginRepositories--> </profile> </profiles> - <properties> - <netbeans.hint.deploy.server>Tomcat60</netbeans.hint.deploy.server> - <netbeans.hint.useExternalMaven>false</netbeans.hint.useExternalMaven> - </properties> </project> Deleted: trunk/lutinrss/src/main/webapp/fckTest.html =================================================================== --- trunk/lutinrss/src/main/webapp/fckTest.html 2008-05-31 16:34:27 UTC (rev 77) +++ trunk/lutinrss/src/main/webapp/fckTest.html 2008-05-31 19:08:24 UTC (rev 78) @@ -1,48 +0,0 @@ -<!-- - Document : test - Created on : 18 avr. 2008, 11:46:56 - Author : poussin ---> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> - <title>Page de test plugin FCKEditor rss</title> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> - <!--link href="feed.css" rel="stylesheet" type="text/css" /--> - <script type="text/javascript" src="/fckeditor/fckeditor.js"></script> - <style type="text/css">div.rssinclude { background-color: #ffff00; }</style> -</head> -<body> -<h1>Test plugin FCKEditor RSS (*)</h1> -<form name="EditPostView" action="#" method="GET"> - <script type="text/javascript"> - <!-- - var oFCKeditor = new FCKeditor( 'rssTest' ) ; - oFCKeditor.Config["CustomConfigurationsPath"] = oFCKeditor.BasePath+"/myfckconfig.js"; - - var content = "<div contenteditable='false' class=\"rssinclude\" name=\"rssinclude\" feedname=\"http://www.lemondeinformatique.fr/flux-rss/open-source/rss.xml\" nbitem=\"2\" feedrepr=\"n-n\">RSS http://www.lemondeinformatique.fr/flux-rss/open-source/rss.xml (items:2)</div><br></br>"; - //content+="<div contenteditable='false' name=\"rssinclude\" class=\"rssinclude\" feedname=\"http://www.lemonde.fr/rss/sequence/0,2-3208,1-0,0.xml\" nbitem=\"2\" feedrepr=\"indat-natd\" \">RSS http://www.lemonde.fr/rss/sequence/0,2-3208,1-0,0.xml (items:2)</div><br/>"; - //content+="<div contenteditable='false' name=\"rssinclude\" class=\"rssinclude\" feedname=\"http://blog.developpez.com/xmlsrv/rss2.php?blog=42\" nbitem=\"3\" feedRepr=\"indat-natd\" \">RSS http://blog.developpez.com/xmlsrv/rss2.php?blog=42 (items:3)</div><br/>"; - //content+="<div contenteditable='false' name=\"rssinclude\" class=\"rssinclude\" feedname=\"http://formats-ouverts.org/rss.php\" nbitem=\"4\" feedrepr=\"indat-natd\" \">RSS http://formats-ouverts.org/rss.php (items:4)</div><br/>"; - //content+="<div contenteditable='false' name=\"rssinclude\" class=\"rssinclude\" feedname=\"http://www.h2database.com/html/newsfeed-rss.xml\" nbitem=\"5\" feedRepr=\"indat-natd\" \">RSS http://www.h2database.com/html/newsfeed-rss.xml (items:5)</div><br/>"; - //content+="<div contenteditable='false' name=\"rssinclude\" class=\"rssinclude\" feedname=\"http://www.opensi.org/news.rss\" nbitem=\"6\" feedrepr=\"indat-natd\" \">RSS http://www.opensi.org/news.rss (items:6)</div>"; - content += "<s"+"cript src=\"/lutinrss-2.1/RSSServlet\"></scri"+"pt><hr/><p>content...</p>"; - oFCKeditor.Value = content; - oFCKeditor.Create() ; - --> - </script> - <hr/> - <input type="submit" value="envoyer"> -</form> -<p>(*) required a FCKEditor 2.6 available on / apache path (means /fckeditor points to fckeditor root directory)</p> -<p>add custom config like this code : - <pre> -var oFCKeditor = new FCKeditor( 'rssTest' ) ; -oFCKeditor.Config["CustomConfigurationsPath"] = oFCKeditor.BasePath+"/myfckconfig.js"; -oFCKeditor.Create() ; - </pre> -</p> - - -</body> -</html> Added: trunk/lutinrss/src/main/webapp/index.html =================================================================== --- trunk/lutinrss/src/main/webapp/index.html (rev 0) +++ trunk/lutinrss/src/main/webapp/index.html 2008-05-31 19:08:24 UTC (rev 78) @@ -0,0 +1,21 @@ +<!-- + Document : test + Created on : 18 avr. 2008, 11:46:56 + Author : poussin +--> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<html> +<head> + <title>Page de tests</title> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> +</head> + <body> + <h1>LutinRSS tests index</h1> + <ul> + <li><a href="testRender.html" target="render">Test de rendu</a></li> + <li><a href="testGenerator.html" target="generator">Test de génération de flux</a></li> + <li><a href="testFck.html" target="fck">Test du plugin rssinclude dans fckeditor 2.6</a> (*)</li> + </ul> + <p>(*) required a FCKEditor 2.6 available on / apache path (means /fckeditor points to fckeditor root directory)</p> +</body> +</html> Modified: trunk/lutinrss/src/main/webapp/rssgenerator.js =================================================================== --- trunk/lutinrss/src/main/webapp/rssgenerator.js 2008-05-31 16:34:27 UTC (rev 77) +++ trunk/lutinrss/src/main/webapp/rssgenerator.js 2008-05-31 19:08:24 UTC (rev 78) @@ -1,6 +1,5 @@ function rssgeneratorUpdateDiv(divs) { - //var serlvetUrl = "%1$1"; - var serlvetUrl = "http://tomcat-test/lutinrss-2.1/RSSGeneratorServlet?action=list"; + var serlvetUrl = "RSSGeneratorServlet?action=list"; win = window; var xhr = null; var error=null; Deleted: trunk/lutinrss/src/main/webapp/test.html =================================================================== --- trunk/lutinrss/src/main/webapp/test.html 2008-05-31 16:34:27 UTC (rev 77) +++ trunk/lutinrss/src/main/webapp/test.html 2008-05-31 19:08:24 UTC (rev 78) @@ -1,23 +0,0 @@ -<!-- - Document : test - Created on : 18 avr. 2008, 11:46:56 - Author : poussin ---> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> - <title>Page de test rss</title> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> - <link href="feed.css" rel="stylesheet" type="text/css" /> - <script src="RSSServlet"></script> -</head> - <body> - <h1>Test RSS</h1> - <div name="rssinclude" class="rssinclude" feedName="http://www.lemondeinformatique.fr/flux-rss/open-source/rss.xml" nbItem="1" feedRepr="indat-natd"></div> - <div name="rssinclude" class="rssinclude" feedName="http://www.lemonde.fr/rss/sequence/0,2-3208,1-0,0.xml" nbItem="2" feedRepr="indat-natd"></div> - <div name="rssinclude" class="rssinclude" feedName="http://blog.developpez.com/xmlsrv/rss2.php?blog=42" nbItem="3" feedRepr="indat-natd"></div> - <div name="rssinclude" class="rssinclude" feedName="http://formats-ouverts.org/rss.php" nbItem="4" feedRepr="indat-natd"></div> - <div name="rssinclude" class="rssinclude" feedName="http://www.h2database.com/html/newsfeed-rss.xml" nbItem="5" feedRepr="indat-natd"></div> - <div name="rssinclude" class="rssinclude" feedName="http://www.opensi.org/news.rss" nbItem="6" feedRepr="indat-natd"></div> -</body> -</html> Copied: trunk/lutinrss/src/main/webapp/testFck.html (from rev 63, trunk/lutinrss/src/main/webapp/fckTest.html) =================================================================== --- trunk/lutinrss/src/main/webapp/testFck.html (rev 0) +++ trunk/lutinrss/src/main/webapp/testFck.html 2008-05-31 19:08:24 UTC (rev 78) @@ -0,0 +1,48 @@ +<!-- + Document : test + Created on : 18 avr. 2008, 11:46:56 + Author : poussin +--> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<html> +<head> + <title>Page de test plugin FCKEditor rss</title> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + <!--link href="feed.css" rel="stylesheet" type="text/css" /--> + <script type="text/javascript" src="/fckeditor/fckeditor.js"></script> + <style type="text/css">div.rssinclude { background-color: #ffff00; }</style> +</head> +<body> +<h1>Test plugin FCKEditor RSS (*)</h1> +<form name="EditPostView" action="#" method="GET"> + <script type="text/javascript"> + <!-- + var oFCKeditor = new FCKeditor( 'rssTest' ) ; + oFCKeditor.Config["CustomConfigurationsPath"] = oFCKeditor.BasePath+"/myfckconfig.js"; + + var content = "<div contenteditable='false' class=\"rssinclude\" name=\"rssinclude\" feedname=\"http://www.lemondeinformatique.fr/flux-rss/open-source/rss.xml\" nbitem=\"2\" feedrepr=\"n-n\">RSS http://www.lemondeinformatique.fr/flux-rss/open-source/rss.xml (items:2)</div><br></br>"; + //content+="<div contenteditable='false' name=\"rssinclude\" class=\"rssinclude\" feedname=\"http://www.lemonde.fr/rss/sequence/0,2-3208,1-0,0.xml\" nbitem=\"2\" feedrepr=\"indat-natd\" \">RSS http://www.lemonde.fr/rss/sequence/0,2-3208,1-0,0.xml (items:2)</div><br/>"; + //content+="<div contenteditable='false' name=\"rssinclude\" class=\"rssinclude\" feedname=\"http://blog.developpez.com/xmlsrv/rss2.php?blog=42\" nbitem=\"3\" feedRepr=\"indat-natd\" \">RSS http://blog.developpez.com/xmlsrv/rss2.php?blog=42 (items:3)</div><br/>"; + //content+="<div contenteditable='false' name=\"rssinclude\" class=\"rssinclude\" feedname=\"http://formats-ouverts.org/rss.php\" nbitem=\"4\" feedrepr=\"indat-natd\" \">RSS http://formats-ouverts.org/rss.php (items:4)</div><br/>"; + //content+="<div contenteditable='false' name=\"rssinclude\" class=\"rssinclude\" feedname=\"http://www.h2database.com/html/newsfeed-rss.xml\" nbitem=\"5\" feedRepr=\"indat-natd\" \">RSS http://www.h2database.com/html/newsfeed-rss.xml (items:5)</div><br/>"; + //content+="<div contenteditable='false' name=\"rssinclude\" class=\"rssinclude\" feedname=\"http://www.opensi.org/news.rss\" nbitem=\"6\" feedrepr=\"indat-natd\" \">RSS http://www.opensi.org/news.rss (items:6)</div>"; + content += "<s"+"cript src=\"/lutinrss-2.1/RSSServlet\"></scri"+"pt><hr/><p>content...</p>"; + oFCKeditor.Value = content; + oFCKeditor.Create() ; + --> + </script> + <hr/> + <input type="submit" value="envoyer"> +</form> +<p>(*) required a FCKEditor 2.6 available on / apache path (means /fckeditor points to fckeditor root directory)</p> +<p>add custom config like this code : + <pre> +var oFCKeditor = new FCKeditor( 'rssTest' ) ; +oFCKeditor.Config["CustomConfigurationsPath"] = oFCKeditor.BasePath+"/myfckconfig.js"; +oFCKeditor.Create() ; + </pre> +</p> + + +</body> +</html> Modified: trunk/lutinrss/src/main/webapp/testGenerator.html =================================================================== --- trunk/lutinrss/src/main/webapp/testGenerator.html 2008-05-31 16:34:27 UTC (rev 77) +++ trunk/lutinrss/src/main/webapp/testGenerator.html 2008-05-31 19:08:24 UTC (rev 78) @@ -37,9 +37,9 @@ <td width="50%" valign="top"> <form method="post" action="RSSGeneratorServlet"> <fieldset> - <legend><input type="submit" value="create a new feed"></legend> + <legend> <input type="submit" value="create a new feed"> </legend> <input type="hidden" name="action" value="create"> - <input type="hidden" name="from" value="/lutinrss-2.1/testGenerator.html"> + <input type="hidden" name="from" value="testGenerator.html"> <table> <tr> <td>feedName (*) :</td> @@ -65,11 +65,9 @@ <td width="50%" valign="top"> <form name="feeds" method="post" action="RSSGeneratorServlet"> <fieldset> - <legend> - <input type="submit" value="add item to feed" onclick="return doAction('addItem');"> + <legend> <input type="submit" value="add item to feed" onclick="return doAction('addItem');"> <input type="submit" value="delete feed" onclick="return doAction('delete');"> - <input type="submit" value="show feed" onclick="return doAction('show');"> - </legend> + <input type="submit" value="show feed" onclick="return doAction('show');"> </legend> <input type="hidden" name="from" value="testGenerator.html"> <input type="hidden" name="action" value=""> <table> Copied: trunk/lutinrss/src/main/webapp/testRender.html (from rev 63, trunk/lutinrss/src/main/webapp/test.html) =================================================================== --- trunk/lutinrss/src/main/webapp/testRender.html (rev 0) +++ trunk/lutinrss/src/main/webapp/testRender.html 2008-05-31 19:08:24 UTC (rev 78) @@ -0,0 +1,23 @@ +<!-- + Document : test + Created on : 18 avr. 2008, 11:46:56 + Author : poussin +--> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<html> +<head> + <title>Page de test rss</title> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + <link href="feed.css" rel="stylesheet" type="text/css" /> + <script src="RSSServlet"></script> +</head> + <body> + <h1>Test RSS</h1> + <div name="rssinclude" class="rssinclude" feedName="http://www.lemondeinformatique.fr/flux-rss/open-source/rss.xml" nbItem="1" feedRepr="indat-natd"></div> + <div name="rssinclude" class="rssinclude" feedName="http://www.lemonde.fr/rss/sequence/0,2-3208,1-0,0.xml" nbItem="2" feedRepr="indat-natd"></div> + <div name="rssinclude" class="rssinclude" feedName="http://blog.developpez.com/xmlsrv/rss2.php?blog=42" nbItem="3" feedRepr="indat-natd"></div> + <div name="rssinclude" class="rssinclude" feedName="http://formats-ouverts.org/rss.php" nbItem="4" feedRepr="indat-natd"></div> + <div name="rssinclude" class="rssinclude" feedName="http://www.h2database.com/html/newsfeed-rss.xml" nbItem="5" feedRepr="indat-natd"></div> + <div name="rssinclude" class="rssinclude" feedName="http://www.opensi.org/news.rss" nbItem="6" feedRepr="indat-natd"></div> +</body> +</html> Modified: trunk/lutinrss/src/test/java/org/codelutin/rss/RSSGeneratorHelperTest.java =================================================================== --- trunk/lutinrss/src/test/java/org/codelutin/rss/RSSGeneratorHelperTest.java 2008-05-31 16:34:27 UTC (rev 77) +++ trunk/lutinrss/src/test/java/org/codelutin/rss/RSSGeneratorHelperTest.java 2008-05-31 19:08:24 UTC (rev 78) @@ -11,44 +11,59 @@ import java.text.ParseException; import java.util.List; import java.util.Map; -import junit.framework.TestCase; /** * * @author tony */ -public class RSSGeneratorHelperTest extends TestCase { +public class RSSGeneratorHelperTest extends junit.framework.TestCase { - RSSGeneratorHelper helper; + static RSSGenerator helper; static File f; + @Override + protected void setUp() throws Exception { + super.setUp(); + if (helper == null) { + helper = RSSGenerator.newDefaultInstance(); + } + if (f == null) { + f = getFeedFile(); + } + } + + @Override + protected void tearDown() throws Exception { + super.tearDown(); + } + public void testCreateFeed() throws Exception { Map<Field, Object> values = new java.util.HashMap<Field, Object>(); values.put(Field.NAME, "feedName : " + f.getName()); values.put(Field.DESCRIPTION, "feedDescription : " + f.getName()); values.put(Field.LINK, f.toURI().toURL() + ""); - values.put(Field.TIME, RSSGeneratorHelper.DATE_PARSER.format(new java.util.Date())); + values.put(Field.TIME, RSSGenerator.DATE_PARSER.format(new java.util.Date())); assertFalse(f.exists()); - RSSGeneratorHelper.log.info("feedFile : " + f); - helper.createFeedFile(f.toURI().toURL(), RSSConfig.DEFAULT_GENERATOR_FORMAT, values); + RSSGenerator.log.info("feedFile : " + f); + helper.createFeedFile(f.toURI().toURL(), RSSGeneratorConfig.DEFAULT_GENERATOR_FORMAT, values); // no lock - assertFalse(new File(f.getAbsolutePath() + ".lock").exists()); + assertFalse(helper.getWriteFileLock(f).exists()); // file exist assertTrue(f.exists()); SyndFeed feed = RSSIOUtil.readFeed(f.toURI().toURL()); - if (RSSGeneratorHelper.log.isDebugEnabled()) { - RSSGeneratorHelper.log.debug(feed); + if (RSSGenerator.log.isDebugEnabled()) { + RSSGenerator.log.debug(feed); } - assertEquals(feed.getFeedType(), RSSConfig.DEFAULT_GENERATOR_FORMAT.getType()); + assertEquals(feed.getFeedType(), RSSGeneratorConfig.DEFAULT_GENERATOR_FORMAT.getType()); assertEquals(feed.getLink(), values.get(Field.LINK)); assertEquals(feed.getTitle(), values.get(Field.NAME)); assertEquals(feed.getDescription(), values.get(Field.DESCRIPTION)); - assertEquals(feed.getPublishedDate(), RSSGeneratorHelper.DATE_PARSER.parse((String) values.get(Field.TIME))); + assertEquals(feed.getPublishedDate(), RSSGenerator.DATE_PARSER.parse((String) values.get(Field.TIME))); } @@ -58,12 +73,12 @@ values.put(Field.NAME, "feedName : " + f.getName()); values.put(Field.DESCRIPTION, "feedDescription : " + f.getName()); values.put(Field.LINK, f.toURI().toURL() + ""); - values.put(Field.TIME, RSSGeneratorHelper.DATE_PARSER.format(new java.util.Date())); + values.put(Field.TIME, RSSGenerator.DATE_PARSER.format(new java.util.Date())); assertTrue(f.exists()); try { - helper.createFeedFile(f.toURI().toURL(), FeedType.RSS_1_0, values); + helper.createFeedFile(f.toURI().toURL(), RSSGeneratorConfig.DEFAULT_GENERATOR_FORMAT, values); // file already exist, can not reach this code fail(); } catch (IllegalStateException e) { @@ -85,8 +100,8 @@ List entries = feed.getEntries(); assertEquals(1, entries.size()); - if (RSSGeneratorHelper.log.isDebugEnabled()) { - RSSGeneratorHelper.log.debug(feed); + if (RSSGenerator.log.isDebugEnabled()) { + RSSGenerator.log.debug(feed); } SyndEntry entry = (SyndEntry) entries.get(0); @@ -158,11 +173,11 @@ assertEquals(entry.getLink(), values.get(Field.LINK)); assertEquals(entry.getTitle(), values.get(Field.NAME)); assertEquals(entry.getDescription().getValue(), values.get(Field.DESCRIPTION)); - assertEquals(entry.getPublishedDate(), RSSGeneratorHelper.DATE_PARSER.parse((String) values.get(Field.TIME))); + assertEquals(entry.getPublishedDate(), RSSGenerator.DATE_PARSER.parse((String) values.get(Field.TIME))); } protected File getFeedFile() { - return new File("/tmp/" + getClass().getSimpleName() + "-" + System.nanoTime() + ".xml"); + return new File(helper.getGeneratorDirectory(), getClass().getSimpleName() + "-" + System.nanoTime() + ".xml"); } protected Map<Field, Object> createEntry(int number) throws MalformedURLException { @@ -170,21 +185,8 @@ values.put(Field.NAME, "entryName : " + f.getName() + "-" + number); values.put(Field.DESCRIPTION, "entryDescription : " + f.getName() + "-" + number); values.put(Field.LINK, f.toURI().toURL() + "/entry-" + number); - values.put(Field.TIME, RSSGeneratorHelper.DATE_PARSER.format(new java.util.Date())); + values.put(Field.TIME, RSSGenerator.DATE_PARSER.format(new java.util.Date())); return values; } - @Override - protected void setUp() throws Exception { - super.setUp(); - helper = RSSGeneratorHelper.getInstance(); - if (f == null) { - f = getFeedFile(); - } - } - - @Override - protected void tearDown() throws Exception { - super.tearDown(); - } }