[Jboss-svn-commits] JBL Code SVN: r960 - trunk/forge/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor

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

Author: adamw
Date: 2005-08-25 12:33:00 -0400 (Thu, 25 Aug 2005)
New Revision: 960

Modified:
   trunk/forge/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConTools.java
Log:
URL scheme fix


Modified: trunk/forge/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConTools.java
===================================================================
--- trunk/forge/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConTools.java	2005-08-25 16:16:49 UTC (rev 959)
+++ trunk/forge/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConTools.java	2005-08-25 16:33:00 UTC (rev 960)
@@ -44,17 +44,19 @@
 	static String getBaseServerAddress() {
 		int port;
 		String server;
+		String scheme;
 		Object request = getExternalContext().getRequest();
 		if (request instanceof JBossActionRequest) {
+			scheme = ((JBossActionRequest) request).getScheme();
 			port = ((JBossActionRequest) request).getServerPort();
 			server = ((JBossActionRequest) request).getServerName();
 		} else if (request instanceof JBossRenderRequest) {
+			scheme = ((JBossRenderRequest) request).getScheme();
 			port = ((JBossRenderRequest) request).getServerPort();
 			server = ((JBossRenderRequest) request).getServerName();
 		} else return "";
 		
-		return (((port == 80) || (port == 8080)) ? "http" : "https") + 
-			"://" + server + ":" + port;
+		return scheme + "://" + server + ":" + port;
 	}
 	
 	static String getPortalName() {