svn commit: r620626 - /geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java

[va...@apache.org]

Author: vamsic007
Date: Mon Feb 11 13:54:59 2008
New Revision: 620626

URL: http://svn.apache.org/viewvc?rev=620626&view=rev
Log:
GERONIMO-3837 allowLinking Tomcat atttibute in StandardContext not configurable through Geronimo
 o Enabling this attribute per server instance using a system property org.apache.geronimo.tomcat.GeronimoStandardContext.allowLinking
 o Merging rev 620623 from trunk

Modified:
    geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java

Modified: geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java?rev=620626&r1=620625&r2=620626&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java (original)
+++ geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java Mon Feb 11 13:54:59 2008
@@ -57,6 +57,9 @@
 import org.apache.geronimo.webservices.WebServiceContainerInvoker;
 
 
+/**
+ * @version $Rev$ $Date$
+ */
 public class GeronimoStandardContext extends StandardContext {
 
     private static final long serialVersionUID = 3834587716552831032L;
@@ -71,6 +74,11 @@
     private BeforeAfter beforeAfter = null;
     private int contextCount = 0;
     
+    private static final boolean allowLinking;
+    
+    static {
+        allowLinking = new Boolean(System.getProperty("org.apache.geronimo.tomcat.GeronimoStandardContext.allowLinking", "false"));
+    }
 
     public void setContextProperties(TomcatContext ctx) throws DeploymentException {
 
@@ -184,6 +192,8 @@
         this.setCrossContext(ctx.isCrossContext());
 
         this.setWorkDir(ctx.getWorkDir());
+
+        super.setAllowLinking(allowLinking);
 
         this.setCookies(!ctx.isDisableCookies());