[Openutils-svn] SF.net SVN: openutils:[4187] magnoliamodules/trunk/openutils-mgnlmedia/src/ main/java/net/sourceforge/openutils/mgnlmedia/media

[<fg...@us...>]

Revision: 4187
          http://openutils.svn.sourceforge.net/openutils/?rev=4187&view=rev
Author:   fgiust
Date:     2013-02-04 15:51:16 +0000 (Mon, 04 Feb 2013)
Log Message:
-----------
MEDIA-297 Add a configurable base url/host for generated resource urls

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java	2013-02-04 15:44:03 UTC (rev 4186)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java	2013-02-04 15:51:16 UTC (rev 4187)
@@ -85,6 +85,8 @@
 
     private LockUtils locks = new LockUtils(4);
 
+    private String baseurl;
+
     /**
      * Constructor
      */
@@ -343,4 +345,23 @@
     {
         return locks;
     }
+
+    /**
+     * Returns the baseurl.
+     * @return the baseurl
+     */
+    public String getBaseurl()
+    {
+        return baseurl;
+    }
+
+    /**
+     * Sets the baseurl.
+     * @param baseurl the baseurl to set
+     */
+    public void setBaseurl(String baseurl)
+    {
+        this.baseurl = baseurl;
+    }
+
 }

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java	2013-02-04 15:44:03 UTC (rev 4186)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java	2013-02-04 15:51:16 UTC (rev 4187)
@@ -200,7 +200,7 @@
         {
             return null;
         }
-        return mtc.getHandler().getUrl(media, options);
+        return appendBaseUrl(mtc.getHandler().getUrl(media, options));
     }
 
     /**
@@ -299,7 +299,7 @@
             Point size = ImageUtils.parseForSize(resolution);
             if (width == size.x && height == size.y)
             {
-                return mcm.getURIMappingPrefix() + prop.getProperty(FileProperties.PATH);
+                return appendBaseUrl(mcm.getURIMappingPrefix() + prop.getProperty(FileProperties.PATH));
             }
         }
 
@@ -317,7 +317,7 @@
             {
                 String resPath = new FileProperties(resolutions, resString).getProperty(FileProperties.PATH);
 
-                return mcm.getURIMappingPrefix() + resPath;
+                return appendBaseUrl(mcm.getURIMappingPrefix() + resPath);
 
             }
         }
@@ -361,7 +361,7 @@
                     }
                     catch (RepositoryException e)
                     {
-                        res = null;
+                        // do nothing
                     }
                 }
             }
@@ -922,4 +922,14 @@
         return tagsLoc(media, null);
     }
 
+    private static String appendBaseUrl(String url)
+    {
+        String baseurl = module().getBaseurl();
+        if (baseurl != null && StringUtils.isNotEmpty(url) && !StringUtils.contains(url, "://"))
+        {
+            return baseurl + url;
+        }
+        return url;
+    }
+
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.