[Bigdata-commit] SF.net SVN: bigdata:[8018] branches/RDR/bigdata-sails/src/java/com/bigdata/ rdf/sail/webapp/BigdataServlet.java

[<tho...@us...>]

Revision: 8018
          http://sourceforge.net/p/bigdata/code/8018
Author:   thompsonbry
Date:     2014-03-26 16:13:38 +0000 (Wed, 26 Mar 2014)
Log Message:
-----------
Removed reference to the HALoadBalancerServlet that was breaking thr tomcat WAR deployment.

Modified Paths:
--------------
    branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataServlet.java

Modified: branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataServlet.java
===================================================================
--- branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataServlet.java	2014-03-26 15:47:14 UTC (rev 8017)
+++ branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataServlet.java	2014-03-26 16:13:38 UTC (rev 8018)
@@ -43,7 +43,6 @@
 import com.bigdata.journal.AbstractJournal;
 import com.bigdata.journal.IIndexManager;
 import com.bigdata.quorum.AbstractQuorum;
-import com.bigdata.rdf.sail.webapp.HALoadBalancerServlet.InitParams;
 import com.bigdata.rdf.sail.webapp.client.IMimeTypes;
 
 /**
@@ -76,9 +75,12 @@
     /**
      * The {@link ServletContext} attribute whose value is the prefix for the
      * {@link HALoadBalancerServlet} iff it is running.
+     * <p>
+     * Note: Do NOT reference the <code>HALoadBalancerServlet</code> here. It
+     * will drag in the jetty dependencies and that breaks the tomcat WAR
+     * deployment.
      */
-    static final String ATTRIBUTE_LBS_PREFIX = HALoadBalancerServlet.class
-            .getName() + "." + InitParams.PREFIX;
+    static final String ATTRIBUTE_LBS_PREFIX = "com.bigdata.rdf.sail.webapp.HALoadBalancerServlet.prefix";
             
 //    /**
 //     * The {@link ServletContext} attribute whose value is the

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.