Menu
▾
▴
[Bigdata-commit] SF.net SVN: bigdata:[7989] branches/RDR/bigdata-sails/src/java/com/bigdata/ rdf/sail/webapp
|
From: <tho...@us...> - 2014-03-16 23:25:32
|
Revision: 7989
http://sourceforge.net/p/bigdata/code/7989
Author: thompsonbry
Date: 2014-03-16 23:25:29 +0000 (Sun, 16 Mar 2014)
Log Message:
-----------
Workaround for the ability to compile the code in CI. I still need to figure out the underlying problem since we can not write test suites to the servlet 3.0 API until this is resolved and I do not think it will run against the servlet 2.0 JAR.
See #624 (HA load balancer)
Modified Paths:
--------------
branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataRDFServlet.java
branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataServlet.java
branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/DeleteServlet.java
branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/HALoadBalancerServlet.java
branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/InsertServlet.java
branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/MultiTenancyServlet.java
branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/QueryServlet.java
branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/UpdateServlet.java
Modified: branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataRDFServlet.java
===================================================================
--- branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataRDFServlet.java 2014-03-16 23:09:34 UTC (rev 7988)
+++ branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataRDFServlet.java 2014-03-16 23:25:29 UTC (rev 7989)
@@ -246,7 +246,7 @@
if (timestamp == null) {
- return getConfig(req.getServletContext()).timestamp;
+ return getConfig(getServletContext()).timestamp;
}
@@ -291,7 +291,7 @@
}
// use the default namespace.
- return getConfig(req.getServletContext()).namespace;
+ return getConfig(getServletContext()).namespace;
}
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-16 23:09:34 UTC (rev 7988)
+++ branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataServlet.java 2014-03-16 23:25:29 UTC (rev 7989)
@@ -228,10 +228,11 @@
*
* @throws IOException
*/
- static boolean isWritable(final HttpServletRequest req,
- final HttpServletResponse resp) throws IOException {
+ static boolean isWritable(final ServletContext servletContext,
+ final HttpServletRequest req, final HttpServletResponse resp)
+ throws IOException {
- if(getConfig(req.getServletContext()).readOnly) {
+ if (getConfig(servletContext).readOnly) {
buildResponse(resp, HTTP_METHOD_NOT_ALLOWED, MIME_TEXT_PLAIN,
"Not writable.");
@@ -240,8 +241,7 @@
return false;
}
- final HAStatusEnum haStatus = getHAStatus(getIndexManager(req
- .getServletContext()));
+ final HAStatusEnum haStatus = getHAStatus(getIndexManager(servletContext));
if (haStatus == null) {
// No quorum.
return true;
@@ -270,11 +270,11 @@
*
* @throws IOException
*/
- static boolean isReadable(final HttpServletRequest req,
- final HttpServletResponse resp) throws IOException {
+ static boolean isReadable(final ServletContext ctx,
+ final HttpServletRequest req, final HttpServletResponse resp)
+ throws IOException {
- final HAStatusEnum haStatus = getHAStatus(getIndexManager(req
- .getServletContext()));
+ final HAStatusEnum haStatus = getHAStatus(getIndexManager(ctx));
if (haStatus == null) {
// No quorum.
return true;
@@ -364,7 +364,8 @@
*
* @return The known serviceURIs for this service.
*/
- static public String[] getServiceURIs(final HttpServletRequest req) {
+ static public String[] getServiceURIs(final ServletContext servletContext,
+ final HttpServletRequest req) {
// One or more.
final List<String> serviceURIs = new LinkedList<String>();
@@ -407,8 +408,8 @@
* where LBS is the prefix of the load balancer servlet.
*/
{
- final String prefix = (String) req.getServletContext()
- .getAttribute(ATTRIBUTE_LBS_PREFIX);
+ final String prefix = (String) servletContext.getAttribute(
+ ATTRIBUTE_LBS_PREFIX);
if (prefix != null) {
@@ -421,8 +422,7 @@
// The ContextPath for the webapp. This should be the next thing
// in the [uri].
- final String contextPath = req.getServletContext()
- .getContextPath();
+ final String contextPath = servletContext.getContextPath();
// The index of the end of the ContextPath.
final int endContextPath = nextSlash
Modified: branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/DeleteServlet.java
===================================================================
--- branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/DeleteServlet.java 2014-03-16 23:09:34 UTC (rev 7988)
+++ branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/DeleteServlet.java 2014-03-16 23:25:29 UTC (rev 7989)
@@ -74,7 +74,7 @@
protected void doDelete(final HttpServletRequest req,
final HttpServletResponse resp) throws IOException {
- if (!isWritable(req, resp)) {
+ if (!isWritable(getServletContext(), req, resp)) {
// Service must be writable.
return;
}
@@ -234,7 +234,7 @@
protected void doPost(final HttpServletRequest req,
final HttpServletResponse resp) throws IOException {
- if (!isWritable(req, resp)) {
+ if (!isWritable(getServletContext(), req, resp)) {
// Service must be writable.
return;
}
Modified: branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/HALoadBalancerServlet.java
===================================================================
--- branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/HALoadBalancerServlet.java 2014-03-16 23:09:34 UTC (rev 7988)
+++ branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/HALoadBalancerServlet.java 2014-03-16 23:25:29 UTC (rev 7989)
@@ -563,10 +563,10 @@
}
private String getLeaderURL(final HttpServletRequest request) {
-
- final ServletContext servletContext = request.getServletContext();
- final HAJournal journal = (HAJournal) BigdataServlet
+ final ServletContext servletContext = getServletContext();
+
+ final HAJournal journal = (HAJournal) BigdataServlet
.getIndexManager(servletContext);
final Quorum<HAGlue, QuorumService<HAGlue>> quorum = journal.getQuorum();
Modified: branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/InsertServlet.java
===================================================================
--- branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/InsertServlet.java 2014-03-16 23:09:34 UTC (rev 7988)
+++ branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/InsertServlet.java 2014-03-16 23:25:29 UTC (rev 7989)
@@ -106,7 +106,7 @@
protected void doPost(HttpServletRequest req, HttpServletResponse resp)
throws IOException {
- if (!isWritable(req, resp)) {
+ if (!isWritable(getServletContext(), req, resp)) {
// Service must be writable.
return;
}
Modified: branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/MultiTenancyServlet.java
===================================================================
--- branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/MultiTenancyServlet.java 2014-03-16 23:09:34 UTC (rev 7988)
+++ branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/MultiTenancyServlet.java 2014-03-16 23:25:29 UTC (rev 7989)
@@ -118,7 +118,7 @@
protected void doPost(final HttpServletRequest req,
final HttpServletResponse resp) throws IOException {
- if (!isWritable(req, resp)) {
+ if (!isWritable(getServletContext(), req, resp)) {
// Service must be writable.
return;
}
@@ -146,7 +146,7 @@
protected void doDelete(final HttpServletRequest req,
final HttpServletResponse resp) throws IOException {
- if (!isWritable(req, resp)) {
+ if (!isWritable(getServletContext(), req, resp)) {
// Service must be writable.
return;
}
@@ -172,7 +172,7 @@
protected void doPut(final HttpServletRequest req,
final HttpServletResponse resp) throws IOException {
- if (!isWritable(req, resp)) {
+ if (!isWritable(getServletContext(), req, resp)) {
// Service must be writable.
return;
}
@@ -582,8 +582,8 @@
final BNode aDataSet = g.getValueFactory().createBNode();
// Figure out the service end point(s).
- final String[] serviceURI = getServiceURIs(req);
-
+ final String[] serviceURI = getServiceURIs(getServletContext(), req);
+
final VoID v = new VoID(g, tripleStore, serviceURI, aDataSet);
v.describeDataSet(false/* describeStatistics */,
Modified: branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/QueryServlet.java
===================================================================
--- branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/QueryServlet.java 2014-03-16 23:09:34 UTC (rev 7988)
+++ branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/QueryServlet.java 2014-03-16 23:25:29 UTC (rev 7989)
@@ -258,8 +258,9 @@
}
// The serviceURIs for this graph.
- final String[] serviceURI = BigdataServlet.getServiceURIs(req);
-
+ final String[] serviceURI = BigdataServlet.getServiceURIs(
+ getServletContext(), req);
+
/*
* TODO Resolve the SD class name and ctor via a configuration property
* for extensible descriptions.
@@ -297,7 +298,7 @@
private void doUpdate(final HttpServletRequest req,
final HttpServletResponse resp) throws IOException {
- if (!isWritable(req, resp)) {
+ if (!isWritable(getServletContext(), req, resp)) {
// Service must be writable.
return;
}
@@ -397,7 +398,7 @@
void doQuery(final HttpServletRequest req, final HttpServletResponse resp)
throws IOException {
- if (!isReadable(req, resp)) {
+ if (!isReadable(getServletContext(), req, resp)) {
// HA Quorum in use, but quorum is not met.
return;
}
@@ -1011,7 +1012,7 @@
private void doEstCard(final HttpServletRequest req,
final HttpServletResponse resp) throws IOException {
- if (!isReadable(req, resp)) {
+ if (!isReadable(getServletContext(), req, resp)) {
// HA Quorum in use, but quorum is not met.
return;
}
@@ -1108,7 +1109,7 @@
private void doContexts(final HttpServletRequest req,
final HttpServletResponse resp) throws IOException {
- if (!isReadable(req, resp)) {
+ if (!isReadable(getServletContext(), req, resp)) {
// HA Quorum in use, but quorum is not met.
return;
}
@@ -1174,7 +1175,7 @@
private void doShardReport(final HttpServletRequest req,
final HttpServletResponse resp) throws IOException {
- if (!isReadable(req, resp)) {
+ if (!isReadable(getServletContext(), req, resp)) {
// HA Quorum in use, but quorum is not met.
return;
}
Modified: branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/UpdateServlet.java
===================================================================
--- branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/UpdateServlet.java 2014-03-16 23:09:34 UTC (rev 7988)
+++ branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/UpdateServlet.java 2014-03-16 23:25:29 UTC (rev 7989)
@@ -72,10 +72,10 @@
}
@Override
- protected void doPut(HttpServletRequest req, HttpServletResponse resp)
- throws IOException {
+ protected void doPut(final HttpServletRequest req,
+ final HttpServletResponse resp) throws IOException {
- if (!isWritable(req, resp)) {
+ if (!isWritable(getServletContext(), req, resp)) {
// Service must be writable.
return;
}
@@ -348,7 +348,7 @@
protected void doPost(final HttpServletRequest req,
final HttpServletResponse resp) throws IOException {
- if (!isWritable(req, resp)) {
+ if (!isWritable(getServletContext(), req, resp)) {
// Service must be writable.
return;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
