[Jboss-svn-commits] JBL Code SVN: r1104 - in trunk/forge/portal-extensions/forge-blog/src: java/org/jboss/portlet/blog web/WEB-INF

[<jbo...@li...>]

Author: adamw
Date: 2005-09-13 16:43:49 -0400 (Tue, 13 Sep 2005)
New Revision: 1104

Modified:
   trunk/forge/portal-extensions/forge-blog/src/java/org/jboss/portlet/blog/BlogPortlet.java
   trunk/forge/portal-extensions/forge-blog/src/web/WEB-INF/portlet.xml
Log:
Blog scheme fix


Modified: trunk/forge/portal-extensions/forge-blog/src/java/org/jboss/portlet/blog/BlogPortlet.java
===================================================================
--- trunk/forge/portal-extensions/forge-blog/src/java/org/jboss/portlet/blog/BlogPortlet.java	2005-09-13 20:43:18 UTC (rev 1103)
+++ trunk/forge/portal-extensions/forge-blog/src/java/org/jboss/portlet/blog/BlogPortlet.java	2005-09-13 20:43:49 UTC (rev 1104)
@@ -88,6 +88,8 @@
 
         feedAddress = replaceProperty(feedAddress, "${host.address}", request
                 .getServerName());
+        feedAddress = replaceProperty(feedAddress, "${scheme.name}", request
+                .getScheme());
         feedAddress = replaceProperty(feedAddress, "${host.port}", Integer
                 .toString(request.getServerPort()));
         if (projectId != null)
@@ -101,6 +103,8 @@
                 .getServerName());
         remoteFeedAddress = replaceProperty(remoteFeedAddress, "${host.port}", Integer
                 .toString(request.getServerPort()));
+        remoteFeedAddress = replaceProperty(remoteFeedAddress, "${scheme.name}", request
+                .getScheme());
         remoteFeedAddress = replaceProperty(remoteFeedAddress, "${project.name}", projectId);
         remoteFeedAddress = replaceProperty(remoteFeedAddress, "${portal.name}", portalName);
         String feedTypeFreeAddress = remoteFeedAddress;

Modified: trunk/forge/portal-extensions/forge-blog/src/web/WEB-INF/portlet.xml
===================================================================
--- trunk/forge/portal-extensions/forge-blog/src/web/WEB-INF/portlet.xml	2005-09-13 20:43:18 UTC (rev 1103)
+++ trunk/forge/portal-extensions/forge-blog/src/web/WEB-INF/portlet.xml	2005-09-13 20:43:49 UTC (rev 1104)
@@ -29,12 +29,12 @@
       <init-param>
          <description>Address of the blog's local feed.</description>
          <name>feedAddress</name>
-         <value>http://${host.address}:${host.port}/blojsom/blog/${project.name}/?flavor=${feed.type}</value>
+         <value>${scheme.name}://${host.address}:${host.port}/blojsom/blog/${project.name}/?flavor=${feed.type}</value>
       </init-param>
       <init-param>
          <description>Address of the blog's remote feed.</description>
          <name>remoteFeedAddress</name>
-         <value>http://${host.address}:${host.port}/blojsom/blog/${project.name}/?flavor=${feed.type}</value>
+         <value>${scheme.name}://${host.address}:${host.port}/blojsom/blog/${project.name}/?flavor=${feed.type}</value>
       </init-param>
       <portlet-info>
          <title>JBoss Blog Portlet</title>