[Mulgara-svn] r1241 - in trunk: . conf conf/core

pag at mulgara.org pag at mulgara.org
Fri Sep 5 15:41:39 UTC 2008


Author: pag
Date: 2008-09-05 08:41:38 -0700 (Fri, 05 Sep 2008)
New Revision: 1241

Added:
   trunk/conf/core/
   trunk/conf/core/mulgara-x-config.xml
Modified:
   trunk/build.xml
Log:
Updated core jar to use a reduced config, along with the default database class

Modified: trunk/build.xml
===================================================================
--- trunk/build.xml	2008-09-05 15:24:22 UTC (rev 1240)
+++ trunk/build.xml	2008-09-05 15:41:38 UTC (rev 1241)
@@ -1926,52 +1926,52 @@
 
     <!-- build the executable jar file -->
     <jar jarfile="${dist.dir}/${mulgara-core.jar}">
-      <zipfileset dir="${conf.dir}" prefix="conf" includes="log4j-mulgara.xml, mulgara-rmi.policy, mulgara.policy"/>
-      <zipfileset src="${bin.dir}/${query.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${driver.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${querylang.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${rmi.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${server.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${server-rmi.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${util.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${config.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${descriptor.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${server-local.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${resolver.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${resolver-spi.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${store.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${store-xa.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${store-nodepool.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${store-nodepool-memory.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${store-nodepool-xa.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${store-stringpool.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${store-stringpool-memory.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${store-stringpool-xa.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${store-stringpool-xa11.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${util-xa.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${resolver-null.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${resolver-file.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${resolver-http.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${resolver-lucene.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${resolver-memory.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${resolver-store.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${resolver-url.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${resolver-view.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${tuples.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${tuples-hybrid.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${content-n3.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${content-rdfxml.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${resolver-nodetype.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${resolver-prefix.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${resolver-relational.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${resolver-distributed.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${resolver-xsd.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${dtd.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${jrdf.base.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${rules.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${krule.jar}" excludes="META-INF/**"/>
+      <zipfileset dir="${conf.dir}" prefix="conf" includes="mulgara-config-core.xml, log4j-mulgara.xml, mulgara-rmi.policy, mulgara.policy"/>
+      <zipfileset file="${conf.dir}/core/mulgara-x-config.xml" prefix="conf"/>
+      <zipfileset src="${bin.dir}/${query.jar}" excludes="**/*.xml, META_INF/**"/>
+      <zipfileset src="${bin.dir}/${driver.jar}" excludes="**/*.xml, META_INF/**"/>
+      <zipfileset src="${bin.dir}/${querylang.jar}" excludes="**/*.xml, META_INF/**"/>
+      <zipfileset src="${bin.dir}/${rmi.jar}" excludes="**/*.xml, META_INF/**"/>
+      <zipfileset src="${bin.dir}/${server.jar}" excludes="**/*.xml, META_INF/**"/>
+      <zipfileset src="${bin.dir}/${server-rmi.jar}" excludes="**/*.xml, META_INF/**"/>
+      <zipfileset src="${bin.dir}/${util.jar}" excludes="**/*.xml, META_INF/**"/>
+      <zipfileset src="${bin.dir}/${config.jar}" excludes="**/*.xml, META_INF/**"/>
+      <zipfileset src="${bin.dir}/${descriptor.jar}" excludes="**/*.xml, META_INF/**"/>
+      <zipfileset src="${bin.dir}/${server-local.jar}" excludes="**/*.xml, META_INF/**"/>
+      <zipfileset src="${bin.dir}/${resolver.jar}" excludes="**/*.xml, META_INF/**"/>
+      <zipfileset src="${bin.dir}/${resolver-spi.jar}" excludes="**/*.xml, META_INF/**"/>
+      <zipfileset src="${bin.dir}/${store.jar}" excludes="**/*.xml, META_INF/**"/>
+      <zipfileset src="${bin.dir}/${store-xa.jar}" excludes="**/*.xml, META_INF/**"/>
+      <zipfileset src="${bin.dir}/${store-nodepool.jar}" excludes="**/*.xml, META_INF/**"/>
+      <zipfileset src="${bin.dir}/${store-nodepool-memory.jar}" excludes="**/*.xml, META_INF/**"/>
+      <zipfileset src="${bin.dir}/${store-nodepool-xa.jar}" excludes="**/*.xml, META_INF/**"/>
+      <zipfileset src="${bin.dir}/${store-stringpool.jar}" excludes="**/*.xml, META_INF/**"/>
+      <zipfileset src="${bin.dir}/${store-stringpool-memory.jar}" excludes="**/*.xml, META_INF/**"/>
+      <zipfileset src="${bin.dir}/${store-stringpool-xa.jar}" excludes="**/*.xml, META_INF/**"/>
+      <zipfileset src="${bin.dir}/${store-stringpool-xa11.jar}" excludes="**/*.xml, META_INF/**"/>
+      <zipfileset src="${bin.dir}/${util-xa.jar}" excludes="**/*.xml, META_INF/**"/>
+      <zipfileset src="${bin.dir}/${resolver-null.jar}" excludes="**/*.xml, META_INF/**"/>
+      <zipfileset src="${bin.dir}/${resolver-file.jar}" excludes="**/*.xml, META_INF/**"/>
+      <zipfileset src="${bin.dir}/${resolver-http.jar}" excludes="**/*.xml, META_INF/**"/>
+      <zipfileset src="${bin.dir}/${resolver-lucene.jar}" excludes="**/*.xml, META_INF/**"/>
+      <zipfileset src="${bin.dir}/${resolver-memory.jar}" excludes="**/*.xml, META_INF/**"/>
+      <zipfileset src="${bin.dir}/${resolver-store.jar}" excludes="**/*.xml, META_INF/**"/>
+      <zipfileset src="${bin.dir}/${resolver-url.jar}" excludes="**/*.xml, META_INF/**"/>
+      <zipfileset src="${bin.dir}/${resolver-view.jar}" excludes="**/*.xml, META_INF/**"/>
+      <zipfileset src="${bin.dir}/${tuples.jar}" excludes="**/*.xml, META_INF/**"/>
+      <zipfileset src="${bin.dir}/${tuples-hybrid.jar}" excludes="**/*.xml, META_INF/**"/>
+      <zipfileset src="${bin.dir}/${content-n3.jar}" excludes="**/*.xml, META_INF/**"/>
+      <zipfileset src="${bin.dir}/${content-rdfxml.jar}" excludes="**/*.xml, META_INF/**"/>
+      <zipfileset src="${bin.dir}/${resolver-nodetype.jar}" excludes="**/*.xml, META_INF/**"/>
+      <zipfileset src="${bin.dir}/${resolver-prefix.jar}" excludes="**/*.xml, META_INF/**"/>
+      <zipfileset src="${bin.dir}/${resolver-relational.jar}" excludes="**/*.xml, META_INF/**"/>
+      <zipfileset src="${bin.dir}/${resolver-distributed.jar}" excludes="**/*.xml, META_INF/**"/>
+      <zipfileset src="${bin.dir}/${resolver-xsd.jar}" excludes="**/*.xml, META_INF/**"/>
+      <zipfileset src="${bin.dir}/${dtd.jar}" excludes="**/*.xml, META_INF/**"/>
+      <zipfileset src="${bin.dir}/${jrdf.base.jar}" excludes="**/*.xml, META_INF/**"/>
+      <zipfileset src="${bin.dir}/${rules.jar}" excludes="**/*.xml, META_INF/**"/>
+      <zipfileset src="${bin.dir}/${krule.jar}" excludes="**/*.xml, META_INF/**"/>
 
-      <zipfileset file="${obj.dir}/mulgara-x-config.xml" prefix="conf" />
       <!-- Schemas -->
       <fileset dir="${src.dir}/jar/dtd" includes="META-INF/**, DTD/**"/>
     </jar>

Added: trunk/conf/core/mulgara-x-config.xml
===================================================================
--- trunk/conf/core/mulgara-x-config.xml	                        (rev 0)
+++ trunk/conf/core/mulgara-x-config.xml	2008-09-05 15:41:38 UTC (rev 1241)
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Mulgara Semantic Store configuration file.
+-->
+
+<MulgaraConfig>
+
+  <!-- Paths to external component configuration, relative to JAR file -->
+  <ExternalConfigPaths>
+    <MulgaraLogging>conf/log4j-mulgara.xml</MulgaraLogging>
+    <WebDefault>conf/webdefault.xml</WebDefault>
+  </ExternalConfigPaths>
+
+  <!--
+    The hostname to bind Mulgara to
+
+    Note. Not setting will cause Mulgara to bind to the canonical local machine name
+  -->
+  <!--<MulgaraHost>localhost</MulgaraHost>-->
+
+  <!--
+    Configuration for the Jetty servlet container
+
+    Note. Not setting the "Host" parameter will cause Jetty to listen on
+          all interfaces
+  -->
+  <Jetty>
+    <Disabled>true</Disabled>
+  </Jetty>
+
+  <!-- The name of the server, used for RMI binding -->
+  <ServerName>server1</ServerName>
+
+  <!-- RMI registry port -->
+  <RMIPort>1099</RMIPort>
+
+  <!--
+    The path to persist data to, one of:
+
+    + . - current directory (directory from which the Mulgara JAR was run)
+    + temp - default system temporary directory
+    + <path> - user defined (OS dependant) path
+  -->
+  <PersistencePath>.</PersistencePath>
+
+  <!-- Maximum duration in seconds for transactions, a positive integer -->
+  <TransactionTimeout>604800</TransactionTimeout> <!-- one week -->
+
+  <!-- Maximum time in seconds a transaction may be idle, a positive integer -->
+  <IdleTimeout>3600</IdleTimeout> <!-- one hour -->
+
+  <!--
+    Database implementation to use, one of:
+
+    org.mulgara.resolver.Database
+    org.mulgara.store.xa.XADatabaseImpl
+      (Metaphasic transactional triple store)
+  <TripleStoreImplementation>org.mulgara.store.xa.XADatabaseImpl</TripleStoreImplementation>
+  -->
+  <TripleStoreImplementation>org.mulgara.resolver.Database</TripleStoreImplementation>
+
+  <!--
+    The Related Query Handler is the implementation of
+    org.mulgara.resolver.RelatedHandler.
+  -->
+  <RelatedQueryHandler
+    type="org.mulgara.resolver.RelatedQueryHandlerImpl"/>
+
+  <!--
+    Security adapter implementation.  If this element is omitted, the only
+    forbidden operations will be the modification or deletion of the system
+    model.
+  -->
+  <!--
+    <SecurityAdapterClass>com.mulgara.store.security.model.ModelSecurityAdapterFactory</SecurityAdapterClass>
+  -->
+
+  <!--
+    Implementations of the persistent and temporary node pools, string pools,
+    and resolvers.  The persistent resolver is used to manipulate the system
+    model.
+  -->
+  <PersistentNodePoolFactory type="org.mulgara.store.nodepool.xa.XANodePoolFactory" dir="xaNodePool"/>
+  <TemporaryNodePoolFactory  type="org.mulgara.store.nodepool.memory.MemoryNodePoolFactory"/>
+  <PersistentStringPoolFactory type="org.mulgara.store.stringpool.xa.XAStringPoolFactory" dir="xaStringPool"/>
+  <TemporaryStringPoolFactory type="org.mulgara.store.stringpool.memory.MemoryStringPoolFactory"/>
+  <PersistentResolverFactory type="org.mulgara.resolver.store.StatementStoreResolverFactory" dir="xaStatementStore"/>
+  <TemporaryResolverFactory type="org.mulgara.resolver.memory.MemoryResolverFactory" dir="tempStatementStore"/>
+
+  <!--
+    Implementations of a rule engine.
+  -->
+  <RuleLoader type="org.mulgara.krule.KruleLoader"/>
+
+  <!--
+    Implementations of the ContentHandler interface to use for resolving MIME
+    types.
+  -->
+  <DefaultContentHandler type="org.mulgara.content.rdfxml.RDFXMLContentHandler"/>
+  <ContentHandler type="org.mulgara.content.n3.N3ContentHandler"/>
+
+  <!--
+    Additional resolvers
+  -->
+  <ResolverFactory type="org.mulgara.resolver.file.FileResolverFactory"/>
+  <ResolverFactory type="org.mulgara.resolver.lucene.LuceneResolverFactory" dir="lucene"/>
+  <ResolverFactory type="org.mulgara.resolver.xsd.XSDResolverFactory"/>
+  <ResolverFactory type="org.mulgara.resolver.http.HttpResolverFactory"/>
+  <ResolverFactory type="org.mulgara.resolver.nodetype.NodeTypeResolverFactory"/>
+  <ResolverFactory type="org.mulgara.resolver.view.ViewResolverFactory"/>
+  <ResolverFactory type="org.mulgara.resolver.prefix.PrefixResolverFactory"/>
+  <ResolverFactory type="org.mulgara.resolver.relational.RelationalResolverFactory"/>
+  <ResolverFactory type="org.mulgara.resolver.distributed.DistributedResolverFactory"/>
+  <ResolverFactory type="org.mulgara.resolver.nullres.NullResolverFactory"/>
+
+  <!-- iTQL script to run on startup -->
+  <StartupScript>foo.itql</StartupScript>
+
+  <!-- smtp server for email notifications
+    mail.xyz.com
+  -->
+  <Smtp></Smtp>
+
+</MulgaraConfig>




More information about the Mulgara-svn mailing list