Menu
▾
▴
[Bigdata-commit] SF.net SVN: bigdata:[4408] branches/QUADS_QUERY_BRANCH
|
From: <tho...@us...> - 2011-04-15 21:12:47
|
Revision: 4408
http://bigdata.svn.sourceforge.net/bigdata/?rev=4408&view=rev
Author: thompsonbry
Date: 2011-04-15 21:12:41 +0000 (Fri, 15 Apr 2011)
Log Message:
-----------
Adding the "
Modified Paths:
--------------
branches/QUADS_QUERY_BRANCH/build.xml
Added Paths:
-----------
branches/QUADS_QUERY_BRANCH/bigdata-war/RWStore.properties
branches/QUADS_QUERY_BRANCH/bigdata-war/WEB-INF/
branches/QUADS_QUERY_BRANCH/bigdata-war/WEB-INF/web.xml
branches/QUADS_QUERY_BRANCH/bigdata-war/classes/
branches/QUADS_QUERY_BRANCH/bigdata-war/classes/log4j.properties
Added: branches/QUADS_QUERY_BRANCH/bigdata-war/RWStore.properties
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-war/RWStore.properties (rev 0)
+++ branches/QUADS_QUERY_BRANCH/bigdata-war/RWStore.properties 2011-04-15 21:12:41 UTC (rev 4408)
@@ -0,0 +1,30 @@
+#
+# Note: These options are applied when the journal and the triple store are
+# first created.
+
+##
+## Journal options.
+##
+
+# The backing file.
+com.bigdata.journal.AbstractJournal.file=bigdata.jnl
+
+# The persistence engine. Use 'Disk' for the WORM or 'DiskRW' for the RWStore.
+com.bigdata.journal.AbstractJournal.bufferMode=DiskRW
+
+com.bigdata.btree.writeRetentionQueue.capacity=4000
+com.bigdata.btree.BTree.branchingFactor=128
+
+# 200M initial extent.
+com.bigdata.journal.AbstractJournal.initialExtent=209715200
+com.bigdata.journal.AbstractJournal.maximumExtent=209715200
+
+##
+## Setup for QUADS mode without the full text index.
+##
+com.bigdata.rdf.sail.truthMaintenance=false
+com.bigdata.rdf.store.AbstractTripleStore.quads=false
+com.bigdata.rdf.store.AbstractTripleStore.statementIdentifiers=false
+com.bigdata.rdf.store.AbstractTripleStore.textIndex=false
+com.bigdata.rdf.store.AbstractTripleStore.axiomsClass=com.bigdata.rdf.axioms.NoAxioms
+#com.bigdata.rdf.store.AbstractTripleStore.inlineDateTimes=true
Property changes on: branches/QUADS_QUERY_BRANCH/bigdata-war/RWStore.properties
___________________________________________________________________
Added: svn:keywords
+ Id Date Revision Author HeadURL
Added: branches/QUADS_QUERY_BRANCH/bigdata-war/WEB-INF/web.xml
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-war/WEB-INF/web.xml (rev 0)
+++ branches/QUADS_QUERY_BRANCH/bigdata-war/WEB-INF/web.xml 2011-04-15 21:12:41 UTC (rev 4408)
@@ -0,0 +1,68 @@
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app>
+ <display-name>Bigdata</display-name>
+ <description>Bigdata</description>
+ <context-param>
+ <param-name>property-file</param-name>
+ <param-value>bigdata/RWStore.properties</param-value>
+ <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". When deploying a web application, the bundled
+ property files are located in the root of the "bigdata" WAR and are located
+ as "bigdata/RWStore.properties", etc.</description>
+ </context-param>
+ <context-param>
+ <param-name>namespace</param-name>
+ <param-value>kb</param-value>
+ <description>The default bigdata namespace of for the triple or quad store
+ instance to be exposed.</description>
+ </context-param>
+ <context-param>
+ <param-name>create</param-name>
+ <param-value>true</param-value>
+ <description>When true a new triple or quads store instance will be created
+ if none is found at that namespace.</description>
+ </context-param>
+ <context-param>
+ <param-name>query-thread-pool-size</param-name>
+ <param-value>16</param-value>
+ <description>The size of the thread pool used to service SPARQL queries -OR-
+ ZERO (0) for an unbounded thread pool.</description>
+ </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>
+ </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>
+ </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>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>REST API</servlet-name>
+ <url-pattern>/bigdata</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Status</servlet-name>
+ <url-pattern>/bigdata/status</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Counters</servlet-name>
+ <url-pattern>/bigdata/counters</url-pattern>
+ </servlet-mapping>
+</web-app>
Property changes on: branches/QUADS_QUERY_BRANCH/bigdata-war/WEB-INF/web.xml
___________________________________________________________________
Added: svn:keywords
+ Id Date Revision Author HeadURL
Added: branches/QUADS_QUERY_BRANCH/bigdata-war/classes/log4j.properties
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-war/classes/log4j.properties (rev 0)
+++ branches/QUADS_QUERY_BRANCH/bigdata-war/classes/log4j.properties 2011-04-15 21:12:41 UTC (rev 4408)
@@ -0,0 +1,80 @@
+# Default log4j configuration. See the individual classes for the
+# specific loggers, but generally they are named for the class in
+# which they are defined.
+
+# Default log4j configuration for testing purposes.
+#
+# You probably want to set the default log level to ERROR.
+#
+log4j.rootCategory=WARN, dest1
+#log4j.rootCategory=WARN, dest2
+
+# Loggers.
+# Note: logging here at INFO or DEBUG will significantly impact throughput!
+log4j.logger.com.bigdata=WARN
+log4j.logger.com.bigdata.btree=WARN
+
+# Normal data loader (single threaded).
+#log4j.logger.com.bigdata.rdf.store.DataLoader=INFO
+
+# dest1
+log4j.appender.dest1=org.apache.log4j.ConsoleAppender
+log4j.appender.dest1.layout=org.apache.log4j.PatternLayout
+log4j.appender.dest1.layout.ConversionPattern=%-5p: %F:%L: %m%n
+#log4j.appender.dest1.layout.ConversionPattern=%-5p: %r %l: %m%n
+#log4j.appender.dest1.layout.ConversionPattern=%-5p: %m%n
+#log4j.appender.dest1.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
+#log4j.appender.dest1.layout.ConversionPattern=%-4r(%d) [%t] %-5p %c(%l:%M) %x - %m%n
+
+# dest2 includes the thread name and elapsed milliseconds.
+# Note: %r is elapsed milliseconds.
+# Note: %t is the thread name.
+# See http://logging.apache.org/log4j/1.2/apidocs/org/apache/log4j/PatternLayout.html
+log4j.appender.dest2=org.apache.log4j.ConsoleAppender
+log4j.appender.dest2.layout=org.apache.log4j.PatternLayout
+log4j.appender.dest2.layout.ConversionPattern=%-5p: %r %X{hostname} %X{serviceUUID} %X{taskname} %X{timestamp} %X{resources} %t %l: %m%n
+
+##
+# Rule execution log. This is a formatted log file (comma delimited).
+log4j.logger.com.bigdata.relation.rule.eval.RuleLog=INFO,ruleLog
+log4j.additivity.com.bigdata.relation.rule.eval.RuleLog=false
+log4j.appender.ruleLog=org.apache.log4j.FileAppender
+log4j.appender.ruleLog.Threshold=ALL
+log4j.appender.ruleLog.File=rules.log
+log4j.appender.ruleLog.Append=true
+# I find that it is nicer to have this unbuffered since you can see what
+# is going on and to make sure that I have complete rule evaluation logs
+# on shutdown.
+log4j.appender.ruleLog.BufferedIO=false
+log4j.appender.ruleLog.layout=org.apache.log4j.PatternLayout
+log4j.appender.ruleLog.layout.ConversionPattern=%m
+
+##
+# Summary query evaluation log (tab delimited file). Uncomment the next line to enable.
+#log4j.logger.com.bigdata.bop.engine.QueryLog=INFO,queryLog
+log4j.additivity.com.bigdata.bop.engine.QueryLog=false
+log4j.appender.queryLog=org.apache.log4j.FileAppender
+log4j.appender.queryLog.Threshold=ALL
+log4j.appender.queryLog.File=queryLog.csv
+log4j.appender.queryLog.Append=true
+# I find that it is nicer to have this unbuffered since you can see what
+# is going on and to make sure that I have complete rule evaluation logs
+# on shutdown.
+log4j.appender.queryLog.BufferedIO=false
+log4j.appender.queryLog.layout=org.apache.log4j.PatternLayout
+log4j.appender.queryLog.layout.ConversionPattern=%m
+
+##
+# BOp run state trace (tab delimited file). Uncomment the next line to enable.
+#log4j.logger.com.bigdata.bop.engine.RunState$TableLog=INFO,queryRunStateLog
+log4j.additivity.com.bigdata.bop.engine.RunState$TableLog=false
+log4j.appender.queryRunStateLog=org.apache.log4j.FileAppender
+log4j.appender.queryRunStateLog.Threshold=ALL
+log4j.appender.queryRunStateLog.File=queryRunState.log
+log4j.appender.queryRunStateLog.Append=true
+# I find that it is nicer to have this unbuffered since you can see what
+# is going on and to make sure that I have complete rule evaluation logs
+# on shutdown.
+log4j.appender.queryRunStateLog.BufferedIO=false
+log4j.appender.queryRunStateLog.layout=org.apache.log4j.PatternLayout
+log4j.appender.queryRunStateLog.layout.ConversionPattern=%m
Property changes on: branches/QUADS_QUERY_BRANCH/bigdata-war/classes/log4j.properties
___________________________________________________________________
Added: svn:keywords
+ Id Date Revision Author HeadURL
Modified: branches/QUADS_QUERY_BRANCH/build.xml
===================================================================
--- branches/QUADS_QUERY_BRANCH/build.xml 2011-04-15 21:02:31 UTC (rev 4407)
+++ branches/QUADS_QUERY_BRANCH/build.xml 2011-04-15 21:12:41 UTC (rev 4408)
@@ -116,7 +116,7 @@
<!-- Builds the bigdata JAR and bundles it together with all of its dependencies in the ${build.dir}/lib directory. -->
<target name="bundleJar" depends="clean, bundle, jar" description="Builds the bigdata JAR and bundles it together with all of its dependencies in the ${build.dir}/lib directory.">
- <copy file="${build.dir}/${version}.jar" todir="${build.dir}/lib" />
+ <copy file="${build.dir}/${version}.jar" todir="${build.dir}/lib"/>
<!--<property name="myclasspath" refid="runtime.classpath" />
<echo message="${myclasspath}"/>-->
</target>
@@ -132,9 +132,6 @@
</jar>
</target>
-
-
-
<!-- This generates an osgi bundle jar, and does not bundled the dependencies.
See 'bundleJar'. -->
<target name="osgi" depends="compile, bundle" description="Generates the osgi bundle jar (see also bundleJar).">
@@ -158,8 +155,8 @@
</jar>
<bnd output="${build.dir}/bundles/com.bigata-${osgi.version}.jar" classpath="${build.dir}/classes" eclipse="false" failok="false" exceptions="true" files="${basedir}/osgi/bigdata.bnd" />
- <bndwrap jars="${build.dir}/lib/unimi/colt-1.2.0.jar" output="${build.dir}/bundles/colt-1.2.0.jar" definitions="${basedir}/osgi/" />
- <bndwrap jars="${build.dir}/lib/unimi/fastutil-5.1.5.jar" output="${build.dir}/bundles/fastutil-5.1.5.jar" definitions="${basedir}/osgi/" />
+ <bndwrap jars="${build.dir}/lib/colt-1.2.0.jar" output="${build.dir}/bundles/colt-1.2.0.jar" definitions="${basedir}/osgi/" />
+ <bndwrap jars="${build.dir}/lib/fastutil-5.1.5.jar" output="${build.dir}/bundles/fastutil-5.1.5.jar" definitions="${basedir}/osgi/" />
<bndwrap jars="${build.dir}/lib/cweb-commons-1.1-b2-dev.jar" output="${build.dir}/bundles/cweb-commons-1.1.2.jar" definitions="${basedir}/osgi/" />
<bndwrap jars="${build.dir}/lib/cweb-extser-0.1-b2-dev.jar" output="${build.dir}/bundles/cweb-extser-1.1.2.jar" definitions="${basedir}/osgi/" />
<bndwrap jars="${build.dir}/lib/dsi-utils-1.0.6-020610.jar" output="${build.dir}/bundles/dsi-utils-1.0.6-020610.jar" definitions="${basedir}/osgi/" />
@@ -202,7 +199,7 @@
</target>
<target name="bundle" description="Bundles all dependencies for easier deployments and releases (does not bundle the bigdata jar).">
-<copy toDir="${build.dir}/lib">
+<copy toDir="${build.dir}/lib" flatten="true">
<fileset dir="${bigdata.dir}/bigdata/lib">
<include name="**/*.jar" />
<include name="**/*.so" />
@@ -226,6 +223,53 @@
</copy>
</target>
+ <!--depends="bundleJar"-->
+ <!--
+ TODO 13M of the resulting WAR is fastutils. We need to slim down that JAR to
+ just the classes that we actually use before deploying it.
+ -->
+ <target name="war"
+ description="Generates a WAR artifact.">
+ <delete file="${build.dir}/bigdata.war"/>
+ <echo message="Building WAR"/>
+ <war destfile="${build.dir}/bigdata.war"
+ webxml="bigdata-war/src/resources/WEB-INF/web.xml"
+ >
+ <fileset dir="bigdata-war/src/html"/>
+ <fileset dir="bigdata-war/src/jsp"/>
+ <fileset dir="bigdata-war/src/images"/>
+ <file file="bigdata-war/src/resources/RWStore.properties"/>
+ <lib dir="${build.dir}/lib">
+ <exclude name="iris*.jar"/>
+ <exclude name="jgrapht*.jar"/>
+ <exclude name="tuprolog*.jar"/>
+ <exclude name="sesame*testsuite*.jar"/>
+ <exclude name="bnd*.jar"/>
+ <exclude name="jetty*.jar"/>
+ <exclude name="servlet-api*.jar"/>
+ <exclude name="zookeeper*.jar"/>
+ <!-- jini -->
+ <exclude name="jini*.jar"/>
+ <exclude name="jsk*.jar"/>
+ <exclude name="mahalo*.jar"/>
+ <exclude name="mercury*.jar"/>
+ <exclude name="norm*.jar"/>
+ <exclude name="outrigger*.jar"/>
+ <exclude name="phoenix*.jar"/>
+ <exclude name="reggie*.jar"/>
+ <exclude name="sdm*.jar"/>
+ <exclude name="start*.jar"/>
+ <exclude name="sun-util*.jar"/>
+ <exclude name="tools*.jar"/>
+ <exclude name="browser*.jar"/>
+ <exclude name="classserver*.jar"/>
+ <exclude name="fiddler*.jar"/>
+ <exclude name="group*.jar"/>
+ </lib>
+ <classes file="bigdata-war/src/resources/log4j.properties"/>
+ </war>
+ </target>
+
<target name="release-prepare" depends="jar, bundle, javadoc" description="create a release.">
<!-- The source tree. -->
<copy toDir="${build.dir}/bigdata/src">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
