Menu
▾
▴
[Bigdata-commit] SF.net SVN: bigdata:[4355] branches/QUADS_QUERY_BRANCH/bigdata
|
From: <tho...@us...> - 2011-03-30 19:51:07
|
Revision: 4355
http://bigdata.svn.sourceforge.net/bigdata/?rev=4355&view=rev
Author: thompsonbry
Date: 2011-03-30 19:51:01 +0000 (Wed, 30 Mar 2011)
Log Message:
-----------
some import cleanup.
hooked the REST API test suite into the top-level TestAll, but this does not hook it in yet for CI builds which depend on the correct behavior of the top-level "junit"
Modified Paths:
--------------
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/TestAll.java
branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataServlet.java
branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/DeleteServlet.java
branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/JettySparqlServer.java
branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/QueryServlet.java
branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/StatusServlet.java
branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/UpdateServlet.java
Added Paths:
-----------
branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestAll.java
Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/TestAll.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/TestAll.java 2011-03-30 19:34:25 UTC (rev 4354)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/TestAll.java 2011-03-30 19:51:01 UTC (rev 4355)
@@ -122,6 +122,9 @@
suite.addTest(com.bigdata.rdf.TestAll.suite());
suite.addTest(com.bigdata.rdf.sail.TestAll.suite());
+ // The REST API test suite.
+ suite.addTest(com.bigdata.rdf.sail.webapp.TestAll.suite());
+
return suite;
}
Modified: branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataServlet.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataServlet.java 2011-03-30 19:34:25 UTC (rev 4354)
+++ branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataServlet.java 2011-03-30 19:51:01 UTC (rev 4355)
@@ -1,13 +1,9 @@
package com.bigdata.rdf.sail.webapp;
-import info.aduna.xml.XMLWriter;
-
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.io.OutputStreamWriter;
import java.io.PrintWriter;
-import java.io.StringWriter;
import java.util.Arrays;
import java.util.Comparator;
import java.util.Iterator;
@@ -15,8 +11,6 @@
import java.util.List;
import java.util.Map;
import java.util.TreeMap;
-import java.util.UUID;
-import java.util.concurrent.Callable;
import java.util.concurrent.atomic.AtomicLong;
import javax.servlet.http.HttpServlet;
@@ -24,16 +18,10 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.log4j.Logger;
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.parser.ParsedQuery;
-import org.openrdf.query.resultio.sparqlxml.SPARQLResultsXMLWriter;
import org.openrdf.repository.RepositoryException;
-import org.openrdf.rio.rdfxml.RDFXMLWriter;
import com.bigdata.bop.BufferAnnotations;
import com.bigdata.bop.IPredicate;
-import com.bigdata.bop.engine.QueryEngine;
import com.bigdata.bop.join.PipelineJoin;
import com.bigdata.btree.IndexMetadata;
import com.bigdata.journal.IAtomicStore;
@@ -43,10 +31,8 @@
import com.bigdata.journal.RWStrategy;
import com.bigdata.journal.TimestampUtility;
import com.bigdata.rdf.sail.BigdataSail;
-import com.bigdata.rdf.sail.BigdataSailGraphQuery;
-import com.bigdata.rdf.sail.BigdataSailRepository;
import com.bigdata.rdf.sail.BigdataSailRepositoryConnection;
-import com.bigdata.rdf.sail.BigdataSailTupleQuery;
+import com.bigdata.rdf.sail.bench.NanoSparqlServer;
import com.bigdata.rdf.sail.webapp.BigdataContext.Config;
import com.bigdata.rdf.sail.webapp.BigdataContext.RunningQuery;
import com.bigdata.rdf.store.AbstractTripleStore;
Modified: branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/DeleteServlet.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/DeleteServlet.java 2011-03-30 19:34:25 UTC (rev 4354)
+++ branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/DeleteServlet.java 2011-03-30 19:51:01 UTC (rev 4355)
@@ -2,7 +2,6 @@
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import java.io.OutputStream;
import java.util.concurrent.atomic.AtomicLong;
import javax.servlet.http.HttpServletRequest;
@@ -11,7 +10,6 @@
import org.apache.log4j.Logger;
import org.openrdf.model.Resource;
import org.openrdf.model.Statement;
-import org.openrdf.query.parser.sparql.SPARQLParserFactory;
import org.openrdf.rio.RDFFormat;
import org.openrdf.rio.RDFHandlerException;
import org.openrdf.rio.RDFParser;
Modified: branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/JettySparqlServer.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/JettySparqlServer.java 2011-03-30 19:34:25 UTC (rev 4354)
+++ branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/JettySparqlServer.java 2011-03-30 19:51:01 UTC (rev 4355)
@@ -63,10 +63,10 @@
super.handle(target, baseRequest, req, resp);
}
} catch (IOException e) {
- // TODO Auto-generated catch block
+ // FIXME Auto-generated catch block
e.printStackTrace();
} catch (ServletException e) {
- // TODO Auto-generated catch block
+ // FIXME Auto-generated catch block
e.printStackTrace();
}
}
@@ -120,7 +120,8 @@
public void startup(final Config config, final IIndexManager indexManager) throws Exception {
setupHandlers(config, indexManager);
- log.info("Calling start");
+ if (log.isInfoEnabled())
+ log.info("Calling start");
start();
@@ -128,7 +129,8 @@
m_running = true;
- log.info("Running on port: " + m_port);
+ if (log.isInfoEnabled())
+ log.info("Running on port: " + m_port);
}
static Handler makeContextHandler(Handler handler, String spec) {
@@ -172,12 +174,11 @@
* @throws Exception
*/
public void shutdownNow() throws Exception {
- BigdataContext.clear();
+ BigdataContext.clear();
+
stop();
-
-
m_port = -1;
m_running = false;
}
@@ -185,4 +186,5 @@
public int getPort() {
return m_port;
}
+
}
Modified: branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/QueryServlet.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/QueryServlet.java 2011-03-30 19:34:25 UTC (rev 4354)
+++ branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/QueryServlet.java 2011-03-30 19:51:01 UTC (rev 4355)
@@ -1,52 +1,16 @@
package com.bigdata.rdf.sail.webapp;
-import info.aduna.xml.XMLWriter;
-
import java.io.IOException;
import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.StringWriter;
-import java.util.Comparator;
-import java.util.TreeMap;
-import java.util.UUID;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicLong;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.log4j.Logger;
-import org.openrdf.model.Resource;
-import org.openrdf.model.Statement;
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.parser.ParsedQuery;
import org.openrdf.query.parser.QueryParser;
import org.openrdf.query.parser.sparql.SPARQLParserFactory;
-import org.openrdf.query.resultio.sparqlxml.SPARQLResultsXMLWriter;
-import org.openrdf.rio.RDFFormat;
-import org.openrdf.rio.RDFHandlerException;
-import org.openrdf.rio.RDFParser;
-import org.openrdf.rio.RDFParserFactory;
-import org.openrdf.rio.RDFParserRegistry;
-import org.openrdf.rio.helpers.RDFHandlerBase;
-import org.openrdf.rio.rdfxml.RDFXMLParser;
-import org.openrdf.rio.rdfxml.RDFXMLWriter;
-import org.openrdf.sail.SailException;
-import com.bigdata.bop.engine.QueryEngine;
-import com.bigdata.journal.ITx;
-import com.bigdata.rdf.sail.BigdataSail;
-import com.bigdata.rdf.sail.BigdataSailGraphQuery;
-import com.bigdata.rdf.sail.BigdataSailRepositoryConnection;
-import com.bigdata.rdf.sail.BigdataSailTupleQuery;
-import com.bigdata.rdf.sail.BigdataSail.BigdataSailConnection;
import com.bigdata.rdf.sail.webapp.BigdataContext.AbstractQueryTask;
-import com.bigdata.rdf.store.AbstractTripleStore;
-import com.bigdata.util.httpd.NanoHTTPD;
public class QueryServlet extends BigdataServlet {
Modified: branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/StatusServlet.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/StatusServlet.java 2011-03-30 19:34:25 UTC (rev 4354)
+++ branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/StatusServlet.java 2011-03-30 19:51:01 UTC (rev 4355)
@@ -6,9 +6,6 @@
import java.util.TreeMap;
import java.util.UUID;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
Modified: branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/UpdateServlet.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/UpdateServlet.java 2011-03-30 19:34:25 UTC (rev 4354)
+++ branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/UpdateServlet.java 2011-03-30 19:51:01 UTC (rev 4355)
@@ -5,20 +5,17 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
-import java.util.Vector;
-import java.util.concurrent.atomic.AtomicLong;
import java.net.HttpURLConnection;
import java.net.URL;
+import java.util.Vector;
+import java.util.concurrent.atomic.AtomicLong;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.log4j.Logger;
import org.openrdf.model.Resource;
import org.openrdf.model.Statement;
-import org.openrdf.query.parser.sparql.SPARQLParserFactory;
import org.openrdf.rio.RDFFormat;
import org.openrdf.rio.RDFHandlerException;
import org.openrdf.rio.RDFParser;
Added: branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestAll.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestAll.java (rev 0)
+++ branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestAll.java 2011-03-30 19:51:01 UTC (rev 4355)
@@ -0,0 +1,67 @@
+/**
+Copyright (C) SYSTAP, LLC 2006-2007. All rights reserved.
+
+Contact:
+ SYSTAP, LLC
+ 4501 Tower Road
+ Greensboro, NC 27410
+ lic...@bi...
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; version 2 of the License.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
+/*
+ * Created on Nov 7, 2007
+ */
+
+package com.bigdata.rdf.sail.webapp;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Test suite.
+ *
+ * @author <a href="mailto:tho...@us...">Bryan Thompson</a>
+ * @version $Id$
+ */
+public class TestAll extends TestCase {
+
+ /**
+ *
+ */
+ public TestAll() {
+ super();
+ }
+
+ /**
+ * @param arg0
+ */
+ public TestAll(String arg0) {
+ super(arg0);
+ }
+
+ public static Test suite() {
+
+ final TestSuite suite = new TestSuite("WebApp");
+
+ suite.addTestSuite(TestJettySparqlServer_StartStop.class);
+
+// suite.addTestSuite(TestNanoSparqlServer.class);
+
+ return suite;
+
+ }
+
+}
Property changes on: branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestAll.java
___________________________________________________________________
Added: svn:keywords
+ Id Date Revision Author HeadURL
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
