svn commit: r1843104 - in /turbine/core/trunk: pom.xml src/java/org/apache/turbine/util/TurbineConfig.java

[pa...@apache.org]

Author: painter
Date: Mon Oct  8 03:10:20 2018
New Revision: 1843104

URL: http://svn.apache.org/viewvc?rev=1843104&view=rev
Log:
Upgrade to servlet-api 4.0.1, need to investigate additional methods in TurbineConfiguration to fully implement, tested and working in tomcat9 with http/2

Modified:
    turbine/core/trunk/pom.xml
    turbine/core/trunk/src/java/org/apache/turbine/util/TurbineConfig.java

Modified: turbine/core/trunk/pom.xml
URL: http://svn.apache.org/viewvc/turbine/core/trunk/pom.xml?rev=1843104&r1=1843103&r2=1843104&view=diff
==============================================================================
--- turbine/core/trunk/pom.xml (original)
+++ turbine/core/trunk/pom.xml Mon Oct  8 03:10:20 2018
@@ -827,12 +827,12 @@
   </reporting>
 
   <dependencies>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <version>3.1.0</version>
-      <scope>provided</scope>
-    </dependency>
+	<dependency>
+	    <groupId>javax.servlet</groupId>
+	    <artifactId>javax.servlet-api</artifactId>
+	    <version>4.0.1</version>
+	    <scope>provided</scope>
+	</dependency>
     <dependency>
       <groupId>org.apache.avalon.framework</groupId>
       <artifactId>avalon-framework-api</artifactId>

Modified: turbine/core/trunk/src/java/org/apache/turbine/util/TurbineConfig.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/TurbineConfig.java?rev=1843104&r1=1843103&r2=1843104&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/TurbineConfig.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/TurbineConfig.java Mon Oct  8 03:10:20 2018
@@ -53,6 +53,8 @@ import org.apache.avalon.framework.activ
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.turbine.Turbine;
+import org.apache.turbine.TurbineConstants;
+import org.apache.turbine.annotation.TurbineConfiguration;
 
 /**
  * A class used for initialization of Turbine without a servlet container.
@@ -89,6 +91,10 @@ import org.apache.turbine.Turbine;
 public class TurbineConfig
         implements ServletConfig, ServletContext, Initializable, Disposable
 {
+	
+    @TurbineConfiguration( TurbineConstants.SESSION_TIMEOUT_KEY )
+    protected int timeout = TurbineConstants.SESSION_TIMEOUT_DEFAULT;
+
     /**
      * Servlet initialization parameter name for the path to
      * TurbineConfiguration.xml file used by Turbine
@@ -931,4 +937,49 @@ public class TurbineConfig
     {
         throw new UnsupportedOperationException();
     }
+
+	@Override
+	public Dynamic addJspFile(String servletName, String jspFile) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public int getSessionTimeout() {
+        // set the session timeout if specified in TR.properties
+        if (timeout > 0)
+        {
+            return timeout;
+        }
+
+        return 0;
+	}
+
+	@Override
+	public void setSessionTimeout(int sessionTimeout) {
+		timeout = sessionTimeout;
+	}
+
+	@Override
+	public String getRequestCharacterEncoding() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void setRequestCharacterEncoding(String encoding) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public String getResponseCharacterEncoding() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void setResponseCharacterEncoding(String encoding) {
+		// TODO Auto-generated method stub
+		
+	}
 }