[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/publisher NewsletterGenerator.java

[nikkoyin]

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/publisher
In directory james.mmbase.org:/tmp/cvs-serv7265

Modified Files:
        NewsletterGenerator.java 
Log Message:
CMSC-1084, Newsletter: sending test email contains empty body,add error 
messages to print out  it uses the system live-path variable


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/publisher
See also: http://www.mmbase.org/jira/browse/CMSC-1084


Index: NewsletterGenerator.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/publisher/NewsletterGenerator.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- NewsletterGenerator.java    22 Oct 2008 08:51:25 -0000      1.14
+++ NewsletterGenerator.java    23 Oct 2008 08:51:47 -0000      1.15
@@ -32,7 +32,7 @@
          log.debug("Try to get content from URL:" + urlPath);
 
          URL url = new URL(urlPath);
-         if (!Pattern.matches("^(http  &brvbarftp  &brvbarfile)://.*",  
urlPath)) {
+         if (!Pattern.matches("http://(\\w+(-\\w+)*)(\\.(\\w+(-\\w+)*))*(\\ 
?\\S*)?$",  urlPath)) {
             errorInfo += "the path does not start with http:// ";
          }
          HttpURLConnection connection = (HttpURLConnection) 
url.openConnection();
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs