Author: hoffmann
Date: Sun Jun 3 23:21:13 2007
New Revision: 544066
URL: http://svn.apache.org/viewvc?view=rev&rev=544066
Log:
revert my changes to TemplateLink and change the field templateURI to be
protected, so it can be accessed by
descendants that need access to it.
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=544066&r1=544065&r2=544066
==============================================================================
---
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
Sun Jun 3 23:21:13 2007
@@ -75,7 +75,7 @@
private String template = null;
/** TemplateURI used as backend for this object */
- private TemplateURI templateURI = null;
+ protected TemplateURI templateURI = null;
/** Logging */
private static Log log = LogFactory.getLog(TemplateLink.class);
@@ -113,15 +113,6 @@
templateURI = new TemplateURI((RunData) data);
- // Set the Server Scheme Based on the use.ssl Property from TR.props
- // If false, http is used and if true https is used.
- 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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
