[prev in list] [next in list] [prev in thread] [next in thread] 

List:       turbine-dev
Subject:    svn commit: r543094 -
From:       hoffmann () apache ! org
Date:       2007-05-31 9:33:04
Message-ID: 20070531093304.E5F901A981A () eris ! apache ! org
[Download RAW message or body]

Author: hoffmann
Date: Thu May 31 02:33:03 2007
New Revision: 543094

URL: http://svn.apache.org/viewvc?view=rev&rev=543094
Log:
added a conditional, to prevent the wrong setting of the port, which is not checked \
by TemplateURI.  In my Eyes this is seems like a possible bug within TemplateURI, \
which checks, whete use.ssl is true, but blindly  sets the port no matter what.

Modified:
    jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/pull/tools/TemplateLink.java


Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/pull/tools/TemplateLink.java
                
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src \
/java/org/apache/turbine/services/pull/tools/TemplateLink.java?view=diff&rev=543094&r1=543093&r2=543094
 ==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/pull/tools/TemplateLink.java \
                (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/pull/tools/TemplateLink.java \
Thu May 31 02:33:03 2007 @@ -25,6 +25,7 @@
 import org.apache.commons.logging.LogFactory;
 
 import org.apache.turbine.Turbine;
+import org.apache.turbine.TurbineConstants;
 import org.apache.turbine.services.pull.ApplicationTool;
 import org.apache.turbine.util.RunData;
 import org.apache.turbine.util.parser.ParameterParser;
@@ -114,7 +115,12 @@
         
         // Set the Server Scheme Based on the use.ssl Property from TR.props
         // If false, http is used and if true https is used.
-        templateURI.setSecure();
+        boolean useSSL = \
Turbine.getConfiguration().getBoolean(TurbineConstants.USE_SSL_KEY, \
TurbineConstants.USE_SSL_DEFAULT); +        if(useSSL)
+        {
+            templateURI.setServerScheme(useSSL ? TemplateURI.HTTPS : \
TemplateURI.HTTP); +            templateURI.setServerPort(TemplateURI.HTTPS_PORT);
+        }
 
         Configuration conf =
                 Turbine.getConfiguration().subset(TEMPLATE_LINK_PREFIX);



---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org


[prev in list] [next in list] [prev in thread] [next in thread]