jenkins-bot has submitted this change and it was merged.
Change subject: T97095: add customized web.xml with query runtime cap
......................................................................
T97095: add customized web.xml with query runtime cap
Change-Id: I341a24124e0ba55757f90deab1fc2bf5f1871971
---
M dist/pom.xml
M dist/src/assembly/dist.xml
A dist/src/config/web.xml
M dist/src/script/RWStore.properties
4 files changed, 142 insertions(+), 3 deletions(-)
Approvals:
Manybubbles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/dist/pom.xml b/dist/pom.xml
index 65952e4..ab05ee1 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -23,7 +23,7 @@
<dependency>
<groupId>com.bigdata</groupId>
<artifactId>bigdata</artifactId>
- <version>1.5.1</version>
+ <version>${blazegraph.version}</version>
<type>war</type>
</dependency>
<dependency>
diff --git a/dist/src/assembly/dist.xml b/dist/src/assembly/dist.xml
index 398676e..af810e1 100644
--- a/dist/src/assembly/dist.xml
+++ b/dist/src/assembly/dist.xml
@@ -18,10 +18,15 @@
</fileSet>
<fileSet>
+ <outputDirectory>blazegraph/WEB-INF</outputDirectory>
+ <directory>${project.basedir}/src/config</directory>
+ </fileSet>
+
+ <fileSet>
<outputDirectory>lib</outputDirectory>
<directory>${project.basedir}/../tools/target</directory>
<includes>
-
<include>wikidata-query-tools-0.0.1-SNAPSHOT-jar-with-dependencies.jar</include>
+
<include>wikidata-query-tools-${project.version}-jar-with-dependencies.jar</include>
</includes>
</fileSet>
diff --git a/dist/src/config/web.xml b/dist/src/config/web.xml
new file mode 100644
index 0000000..b459f29
--- /dev/null
+++ b/dist/src/config/web.xml
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_3_1.xsd";
+ version="3.1">
+ <display-name>Bigdata</display-name>
+ <description>Bigdata</description>
+ <context-param>
+ <description>The property file (for a standalone database instance) or the
+ jini configuration file (for a federation). The file MUST end with either
+ ".properties" or ".config". This path is relative to the directory from
+ which you start the servlet container so you may have to edit it for your
+ installation, e.g., by specifying an absolution path. Also, it is a good
+ idea to review the RWStore.properties file as well and specify the location
+ of the database file on which it will persist your data.
+
+ Note: You MAY override this parameter using
+ "-Dcom.bigdata.rdf.sail.webapp.ConfigParams.propertyFile=FILE"
+ when starting the servlet container.
+ </description>
+ <!-- Note: This path is relative to the directory in which you start -->
+ <!-- the servlet container. For the IDE, this is generally the root -->
+ <!-- of the bigdata project. For the WAR, it depends where you start -->
+ <!-- the servlet container. The "ant war" target rewrites this to be -->
+ <!-- relative to the root of the servlet container by default. -->
+ <param-name>propertyFile</param-name>
+ <!-- from blazegraph/WEB-INF/ -->
+ <param-value>../../RWStore.properties</param-value>
+ </context-param>
+ <context-param>
+ <description>The default bigdata namespace of for the triple or quad store
+ instance to be exposed.</description>
+ <param-name>namespace</param-name>
+ <param-value>wdq</param-value>
+ </context-param>
+ <context-param>
+ <description>When true a new triple or quads store instance will be created
+ if none is found at that namespace.</description>
+ <param-name>create</param-name>
+ <param-value>true</param-value>
+ </context-param>
+ <context-param>
+ <description>The size of the thread pool used to service SPARQL queries -OR-
+ ZERO (0) for an unbounded thread pool.</description>
+ <param-name>queryThreadPoolSize</param-name>
+ <param-value>32</param-value>
+ </context-param>
+ <context-param>
+ <description>When true, the REST API will not permit mutation
operations.</description>
+ <param-name>readOnly</param-name>
+ <param-value>false</param-value>
+ </context-param>
+ <context-param>
+ <description>When non-zero, the timeout for queries
(milliseconds).</description>
+ <param-name>queryTimeout</param-name>
+ <param-value>30000</param-value>
+ </context-param>
+ <listener>
+
<listener-class>com.bigdata.rdf.sail.webapp.BigdataRDFServletContextListener</listener-class>
+ </listener>
+ <servlet>
+ <servlet-name>REST API</servlet-name>
+ <display-name>REST API</display-name>
+ <description>The REST API, including a SPARQL end point, as described at
+
https://sourceforge.net/apps/mediawiki/bigdata/index.php?title=NanoSparqlServer
+ </description>
+ <servlet-class>com.bigdata.rdf.sail.webapp.RESTServlet</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ <async-supported>true</async-supported>
+ </servlet>
+ <servlet>
+ <servlet-name>Multi-Tenancy API</servlet-name>
+ <display-name>Multi-Tenancy API</display-name>
+ <description>The REST API for managing multiple KBs in a single Journal
+ or Fedetation.
+ </description>
+
<servlet-class>com.bigdata.rdf.sail.webapp.MultiTenancyServlet</servlet-class>
+ <async-supported>true</async-supported>
+ </servlet>
+ <servlet>
+ <servlet-name>Status</servlet-name>
+ <display-name>Status</display-name>
+ <description>A status page.</description>
+ <servlet-class>com.bigdata.rdf.sail.webapp.StatusServlet</servlet-class>
+ <async-supported>true</async-supported>
+ </servlet>
+ <servlet>
+ <servlet-name>Counters</servlet-name>
+ <display-name>Performance counters</display-name>
+ <description>Performance counters.</description>
+ <servlet-class>com.bigdata.rdf.sail.webapp.CountersServlet</servlet-class>
+ <async-supported>true</async-supported>
+ </servlet>
+ <!-- Note: The HALoadBalancerServlet is deployed from override-web.xml -->
+ <!-- Serve anything under /html/* as a simple file. -->
+ <servlet-mapping>
+ <servlet-name>default</servlet-name>
+ <url-pattern>/html/*</url-pattern>
+ </servlet-mapping>
+ <!-- Mapping for the default KB namespace (as configured above). -->
+ <servlet-mapping>
+ <servlet-name>REST API</servlet-name>
+ <url-pattern>/sparql</url-pattern>
+ </servlet-mapping>
+ <!-- Mapping for access to non-default KB namespaces.
+ <servlet-mapping>
+ <servlet-name>REST API</servlet-name>
+ <url-pattern>/sparql/*</url-pattern>
+ </servlet-mapping> -->
+ <!-- Mappings for the multi-tenancy API. -->
+ <servlet-mapping>
+ <servlet-name>Multi-Tenancy API</servlet-name>
+ <url-pattern>/namespace</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Multi-Tenancy API</servlet-name>
+ <url-pattern>/namespace/*</url-pattern>
+ </servlet-mapping>
+ <!-- Mapping for the status page. -->
+ <servlet-mapping>
+ <servlet-name>Status</servlet-name>
+ <url-pattern>/status</url-pattern>
+ </servlet-mapping>
+ <!-- Mapping for the performance counters page. -->
+ <servlet-mapping>
+ <servlet-name>Counters</servlet-name>
+ <url-pattern>/counters</url-pattern>
+ </servlet-mapping>
+ <!-- Map the initial request into the UI. -->
+ <welcome-file-list>
+ <welcome-file>html/index.html</welcome-file>
+ </welcome-file-list>
+</web-app>
diff --git a/dist/src/script/RWStore.properties
b/dist/src/script/RWStore.properties
index d0d100a..d927d11 100644
--- a/dist/src/script/RWStore.properties
+++ b/dist/src/script/RWStore.properties
@@ -19,7 +19,8 @@
com.bigdata.rdf.store.AbstractTripleStore.axiomsClass=com.bigdata.rdf.axioms.NoAxioms
# Use the default vocabulary for now.
-com.bigdata.rdf.store.AbstractTripleStore.vocabularyClass=com.bigdata.rdf.vocab.DefaultBigdataVocabulary
+com.bigdata.rdf.store.AbstractTripleStore.vocabularyClass=org.wikidata.query.rdf.blazegraph.WikibaseVocabulary$V001
+com.bigdata.rdf.store.AbstractTripleStore.inlineURIFactory=org.wikidata.query.rdf.blazegraph.WikibaseInlineUriFactory
com.bigdata.rdf.store.AbstractTripleStore.extensionFactoryClass=org.wikidata.query.rdf.blazegraph.WikibaseExtensionFactory
# These seem to be ubiquitous overwrites. Not sure why they aren't the
default but it works.
--
To view, visit https://gerrit.wikimedia.org/r/206471
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I341a24124e0ba55757f90deab1fc2bf5f1871971
Gerrit-PatchSet: 2
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Smalyshev <[email protected]>
Gerrit-Reviewer: Jdouglas <[email protected]>
Gerrit-Reviewer: Manybubbles <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
