You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by tv...@apache.org on 2010/06/23 20:34:33 UTC
svn commit: r957295 - in /turbine/core/trunk:
conf/test/CompleteTurbineResources.properties
src/java/org/apache/turbine/Turbine.java
Author: tv
Date: Wed Jun 23 18:34:33 2010
New Revision: 957295
URL: http://svn.apache.org/viewvc?rev=957295&view=rev
Log:
Fixed access to inner map and added default configuration from Turbine 2.3.3
Modified:
turbine/core/trunk/conf/test/CompleteTurbineResources.properties
turbine/core/trunk/src/java/org/apache/turbine/Turbine.java
Modified: turbine/core/trunk/conf/test/CompleteTurbineResources.properties
URL: http://svn.apache.org/viewvc/turbine/core/trunk/conf/test/CompleteTurbineResources.properties?rev=957295&r1=957294&r2=957295&view=diff
==============================================================================
--- turbine/core/trunk/conf/test/CompleteTurbineResources.properties (original)
+++ turbine/core/trunk/conf/test/CompleteTurbineResources.properties Wed Jun 23 18:34:33 2010
@@ -51,6 +51,29 @@ mail.smtp.from=
# -------------------------------------------------------------------
#
+# S E R V E R D A T A
+#
+# -------------------------------------------------------------------
+# Default ServerData that can be used if asked for before the first
+# request is made.
+#
+# Defaults:
+#
+# serverdata.default.serverName=
+# serverdata.default.serverPort=80
+# serverdata.default.serverScheme=http
+# serverdata.default.scriptName=
+# serverdata.default.contextPath=
+# -------------------------------------------------------------------
+
+serverdata.default.serverName=
+serverdata.default.serverPort=80
+serverdata.default.serverScheme=http
+serverdata.default.scriptName=
+serverdata.default.contextPath=
+
+# -------------------------------------------------------------------
+#
# M O D U L E C A C H I N G
#
# -------------------------------------------------------------------
Modified: turbine/core/trunk/src/java/org/apache/turbine/Turbine.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/Turbine.java?rev=957295&r1=957294&r2=957295&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/Turbine.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/Turbine.java Wed Jun 23 18:34:33 2010
@@ -53,7 +53,6 @@ import org.apache.turbine.services.Inita
import org.apache.turbine.services.InitializationException;
import org.apache.turbine.services.ServiceManager;
import org.apache.turbine.services.TurbineServices;
-// import org.apache.turbine.services.avaloncomponent.AvalonComponentService;
import org.apache.turbine.services.rundata.RunDataService;
import org.apache.turbine.services.template.TemplateService;
import org.apache.turbine.services.template.TurbineTemplate;
@@ -903,7 +902,7 @@ public class Turbine
//
// Bundle all the information above up into a convenient structure
//
- ServerData requestServerData = (ServerData) data.get(ServerData.class);
+ ServerData requestServerData = (ServerData) data.get(Turbine.class, ServerData.class);
serverData = (ServerData) requestServerData.clone();
}