Author: seade
Date: Thu May 31 08:42:24 2007
New Revision: 543168
URL: http://svn.apache.org/viewvc?view=rev&rev=543168
Log:
If getDefaultServerData() is hit after a webapp starts but before anyone has
actually accessed the webapp (e.g. a task scheduled via fulcrum-quartz uses
TurbineURI) ServerData will not have been initialized and you end up with URIs
like "http://";. This change allows you to specify default values for
ServerData.
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/conf/TurbineResources.properties
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/Turbine.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/TurbineConstants.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/changes.xml
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/conf/TurbineResources.properties
URL:
http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/conf/TurbineResources.properties?view=diff&rev=543168&r1=543167&r2=543168
==============================================================================
---
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/conf/TurbineResources.properties
(original)
+++
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/conf/TurbineResources.properties
Thu May 31 08:42:24 2007
@@ -59,6 +59,29 @@
# -------------------------------------------------------------------
#
+# 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:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/Turbine.java
URL:
http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/Turbine.java?view=diff&rev=543168&r1=543167&r2=543168
==============================================================================
---
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/Turbine.java
(original)
+++
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/Turbine.java
Thu May 31 08:42:24 2007
@@ -92,6 +92,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Henning P. Schmiedehausen</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Quinton McCombs</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Eric Pugh</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]">Scott Eade</a>
* @version $Id$
*/
public class Turbine
@@ -565,8 +566,14 @@
{
log.error("ServerData Information requested from Turbine before
first request!");
// Will be overwritten once the first request is run;
- serverData = new ServerData(null, URIConstants.HTTP_PORT,
- URIConstants.HTTP, null, null);
+ serverData = new ServerData(
+ configuration.getString(DEFAULT_SERVER_NAME_KEY),
+ configuration.getInt(DEFAULT_SERVER_PORT_KEY,
+ URIConstants.HTTP_PORT),
+ configuration.getString(DEFAULT_SERVER_SCHEME_KEY,
+ URIConstants.HTTP),
+ configuration.getString(DEFAULT_SCRIPT_NAME_KEY),
+ configuration.getString(DEFAULT_CONTEXT_PATH_KEY));
}
return serverData;
}
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/TurbineConstants.java
URL:
http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/TurbineConstants.java?view=diff&rev=543168&r1=543167&r2=543168
==============================================================================
---
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/TurbineConstants.java
(original)
+++
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/TurbineConstants.java
Thu May 31 08:42:24 2007
@@ -327,4 +327,24 @@
/** Default Encoding for Parameter Parser */
String PARAMETER_ENCODING_DEFAULT = "ISO-8859-1";
+
+ /** Default serverName for ServerData */
+ static final String DEFAULT_SERVER_NAME_KEY
+ = "serverdata.default.serverName";
+
+ /** Default serverPort for ServerData */
+ static final String DEFAULT_SERVER_PORT_KEY
+ = "serverdata.default.serverPort";
+
+ /** Default serverScheme for ServerData */
+ static final String DEFAULT_SERVER_SCHEME_KEY
+ = "serverdata.default.serverScheme";
+
+ /** Default scriptName for ServerData */
+ static final String DEFAULT_SCRIPT_NAME_KEY
+ = "serverdata.default.scriptName";
+
+ /** Default contextPath for ServerData */
+ static final String DEFAULT_CONTEXT_PATH_KEY
+ = "serverdata.default.contextPath";
}
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/changes.xml?view=diff&rev=543168&r1=543167&r2=543168
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/changes.xml
(original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/changes.xml Thu May
31 08:42:24 2007
@@ -28,6 +28,10 @@
<body>
<release version="2.3.3-dev" date="in Subversion">
+ <action type="add" dev="seade">
+ Default ServerData values can now be specified in
+ TurbineResources.properties.
+ </action>
<action type="update" dev="seade">
Update jar dependencies:<br/>
<ul>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
