Revision: 19385
http://sourceforge.net/p/gate/code/19385
Author: ian_roberts
Date: 2016-05-31 19:15:27 +0000 (Tue, 31 May 2016)
Log Message:
-----------
Merged changes from release branch and bumped trunk version to 5.3-SNAPSHOT
Modified Paths:
--------------
mimir/trunk/build.properties
mimir/trunk/doc/admin.tex
mimir/trunk/doc/mimir-guide.pdf
mimir/trunk/doc/mimir-version.tex
mimir/trunk/mimir-client/build/ivy.xml
mimir/trunk/mimir-cloud/.project
mimir/trunk/mimir-cloud/application.properties
mimir/trunk/mimir-core/build/ivy.xml
mimir/trunk/mimir-test/build.xml
mimir/trunk/mimir-test/src/gate/mimir/test/TestQueryParser.java
mimir/trunk/mimir-web/.project
mimir/trunk/mimir-web/grails-app/conf/BuildConfig.groovy.template
Modified: mimir/trunk/build.properties
===================================================================
--- mimir/trunk/build.properties 2016-05-31 19:10:58 UTC (rev 19384)
+++ mimir/trunk/build.properties 2016-05-31 19:15:27 UTC (rev 19385)
@@ -1,4 +1,4 @@
-app.version=5.2-SNAPSHOT
+app.version=5.3-SNAPSHOT
mimir-core.dirname=mimir-core
mimir-client.dirname=mimir-client
plugins.dirname=plugins
Modified: mimir/trunk/doc/admin.tex
===================================================================
--- mimir/trunk/doc/admin.tex 2016-05-31 19:10:58 UTC (rev 19384)
+++ mimir/trunk/doc/admin.tex 2016-05-31 19:15:27 UTC (rev 19385)
@@ -80,9 +80,17 @@
application using the {\tt mimir-web} plugin, you may need to modify it
slightly
to make it mode suitable to your actual usage scenario.
+\subsection{Binary Distribution}
+
+Starting with version 5.2, a pre-built WAR of {\tt mimir-cloud} is available
+for download from \url{https://sourceforge.net/projects/gate/files/}. This can
+be run using any standard Java servlet container, such as Tomcat or Jetty. WAR
+files for nightly snapshot builds can be downloaded from
+\url{http://jenkins.gate.ac.uk/job/GATEMimir-Nightly/}.
+
\subsection{Prerequisites}
-To build the \Mimir\ web application you will need:
+To build your own \Mimir\ web application you will need:
\begin{itemize}
\item A Java 7 or later JDK. \Mimir\ has been tested with the Sun/Oracle and
OpenJDK
JVMs on Linux and Mac OS X.
@@ -122,7 +130,7 @@
\end{enumerate}
The next step is to configure the {\tt mimir-cloud} web application, and is
-described in the following Section.
+described in the following section.
\subsection{Configuring}\label{sec:admin:config}
@@ -133,6 +141,13 @@
nevertheless check the configuration and make sure it is appropriate for your
needs.
+You can modify the {\tt MimirConfig.groovy} file directly, or you can use the
+``external configuration'' mechanism in Grails to override these settings at
+runtime. The {\tt MimirConfig.groovy} settings are merged into the main Grails
+configuration with the prefix {\tt gate.mimir}, so for example to override the
+{\tt queryTokeniserGapp} setting you would set
+{\tt gate.mimir.queryTokeniserGapp = "..."} in the external configuration.
+
\begin{lstlisting}
gateInit {
gateHome = "WEB-INF/gate-home"
@@ -262,10 +277,10 @@
\item {\tt mimir-config.groovy} in the working directory of the Java process.
\end{itemize}
-Any values in these files override values specified in {\tt MimirConfig.groovy}
-or the main application {\tt Config.groovy}. For production deployments, you
-should be sure to specify the public URL of your \Mimir\ server in one of these
-configuration files. For example:
+As described above, any values in these files override values specified in
+{\tt MimirConfig.groovy} or the main application {\tt Config.groovy}. For
+production deployments, you should be sure to specify the public URL of your
+\Mimir\ server in one of these configuration files. For example:
\begin{lstlisting}[texcl]
gate.mimir.indexBaseDirectory = "/data/mimir/indexes"
grails.serverURL = "http://example.com/mimir";
@@ -273,6 +288,9 @@
// as the ROOT web application
\end{lstlisting}
+Note the {\tt gate.mimir} prefix when overriding {\tt MimirConfig.groovy}
+settings.
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\section{Indexes in \Mimir}
Modified: mimir/trunk/doc/mimir-guide.pdf
===================================================================
(Binary files differ)
Modified: mimir/trunk/doc/mimir-version.tex
===================================================================
--- mimir/trunk/doc/mimir-version.tex 2016-05-31 19:10:58 UTC (rev 19384)
+++ mimir/trunk/doc/mimir-version.tex 2016-05-31 19:15:27 UTC (rev 19385)
@@ -8,4 +8,4 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\newcommand{\mimirversion}{5.2-SNAPSHOT}
\ No newline at end of file
+\newcommand{\mimirversion}{5.3-SNAPSHOT}
\ No newline at end of file
Modified: mimir/trunk/mimir-client/build/ivy.xml
===================================================================
--- mimir/trunk/mimir-client/build/ivy.xml 2016-05-31 19:10:58 UTC (rev
19384)
+++ mimir/trunk/mimir-client/build/ivy.xml 2016-05-31 19:15:27 UTC (rev
19385)
@@ -3,7 +3,7 @@
<info
organisation="uk.ac.gate"
module="mimir-client"
- revision="5.2-SNAPSHOT">
+ revision="5.3-SNAPSHOT">
<description homepage="http://gate.ac.uk/mimir"; />
</info>
Modified: mimir/trunk/mimir-cloud/.project
===================================================================
--- mimir/trunk/mimir-cloud/.project 2016-05-31 19:10:58 UTC (rev 19384)
+++ mimir/trunk/mimir-cloud/.project 2016-05-31 19:15:27 UTC (rev 19385)
@@ -37,7 +37,7 @@
<link>
<name>.link_to_grails_plugins</name>
<type>2</type>
-
<locationURI>GRAILS_ROOT/2.5.3/projects/mimir-cloud/plugins</locationURI>
+
<locationURI>GRAILS_ROOT/2.5.4/projects/mimir-cloud/plugins</locationURI>
</link>
</linkedResources>
</projectDescription>
Modified: mimir/trunk/mimir-cloud/application.properties
===================================================================
--- mimir/trunk/mimir-cloud/application.properties 2016-05-31 19:10:58 UTC
(rev 19384)
+++ mimir/trunk/mimir-cloud/application.properties 2016-05-31 19:15:27 UTC
(rev 19385)
@@ -1,5 +1,5 @@
#Grails Metadata file
-#Tue Jun 10 18:19:37 BST 2014
+#Tue May 31 19:01:25 BST 2016
app.grails.version=2.5.4
app.name=mimir-cloud
-app.version=5.2-SNAPSHOT
+app.version=5.3-SNAPSHOT
Modified: mimir/trunk/mimir-core/build/ivy.xml
===================================================================
--- mimir/trunk/mimir-core/build/ivy.xml 2016-05-31 19:10:58 UTC (rev
19384)
+++ mimir/trunk/mimir-core/build/ivy.xml 2016-05-31 19:15:27 UTC (rev
19385)
@@ -3,7 +3,7 @@
<info
organisation="uk.ac.gate"
module="mimir-core"
- revision="5.2-SNAPSHOT">
+ revision="5.3-SNAPSHOT">
<description homepage="http://gate.ac.uk/mimir"; />
</info>
Modified: mimir/trunk/mimir-test/build.xml
===================================================================
--- mimir/trunk/mimir-test/build.xml 2016-05-31 19:10:58 UTC (rev 19384)
+++ mimir/trunk/mimir-test/build.xml 2016-05-31 19:15:27 UTC (rev 19385)
@@ -116,11 +116,13 @@
<pathelement location="${classes.dir}" />
<path refid="compile.classpath" />
</classpath>
+ <sysproperty key="gate.home" value="/Users/ian/svn/gate" />
<sysproperty key="helpers.to.test" value="${helpers.to.test}" />
<!--<sysproperty key="keepTestIndex" value="true" />-->
<formatter type="xml" />
<batchtest>
- <fileset dir="${src.dir}" includes="**/*Tests.java" />
+<!-- <fileset dir="${src.dir}" includes="**/*Tests.java" />-->
+ <fileset dir="${src.dir}" includes="**/TestQueryParser.java" />
</batchtest>
</junit>
</target>
Modified: mimir/trunk/mimir-test/src/gate/mimir/test/TestQueryParser.java
===================================================================
--- mimir/trunk/mimir-test/src/gate/mimir/test/TestQueryParser.java
2016-05-31 19:10:58 UTC (rev 19384)
+++ mimir/trunk/mimir-test/src/gate/mimir/test/TestQueryParser.java
2016-05-31 19:15:27 UTC (rev 19385)
@@ -23,6 +23,8 @@
import gate.mimir.search.query.parser.QueryParser;
import gate.util.GateException;
+import java.io.File;
+
/**
* A JUnit test class for testing the query parser.
*
@@ -37,7 +39,8 @@
logger.debug("Initializing gate for query tests");
try {
Gate.init();
- } catch(GateException e) {
+ Gate.getCreoleRegister().registerDirectories(new
File(Gate.getPluginsHome(), "ANNIE").toURI().toURL());
+ } catch(Exception e) {
fail("Gate initialization failed!");
}
}
@@ -71,6 +74,12 @@
String query = "15 September 2007";
executeParsing(query);
}
+
+ @Test
+ public void testNonAsciiTokens() {
+ String query = "Thîs ís à teßt €12 and 23¢";
+ executeParsing(query);
+ }
@Test
public void testOrQuery() {
@@ -143,7 +152,7 @@
try {
QueryParser.parse(query);
} catch(Exception e) {
- logger.debug(e.getMessage());
+ e.printStackTrace();
fail();
}
}
Modified: mimir/trunk/mimir-web/.project
===================================================================
--- mimir/trunk/mimir-web/.project 2016-05-31 19:10:58 UTC (rev 19384)
+++ mimir/trunk/mimir-web/.project 2016-05-31 19:15:27 UTC (rev 19385)
@@ -38,7 +38,7 @@
<link>
<name>.link_to_grails_plugins</name>
<type>2</type>
-
<locationURI>GRAILS_ROOT/2.5.3/projects/mimir-web/plugins</locationURI>
+
<locationURI>GRAILS_ROOT/2.5.4/projects/mimir-web/plugins</locationURI>
</link>
</linkedResources>
</projectDescription>
Modified: mimir/trunk/mimir-web/grails-app/conf/BuildConfig.groovy.template
===================================================================
--- mimir/trunk/mimir-web/grails-app/conf/BuildConfig.groovy.template
2016-05-31 19:10:58 UTC (rev 19384)
+++ mimir/trunk/mimir-web/grails-app/conf/BuildConfig.groovy.template
2016-05-31 19:15:27 UTC (rev 19385)
@@ -28,8 +28,8 @@
// bring in mimir-core and mimir-client from local m2 repository - this
will
// bring GATE and MG4J as transitive dependencies
- compile("uk.ac.gate:mimir-core:5.2-SNAPSHOT",
- "uk.ac.gate:mimir-client:5.2-SNAPSHOT")
+ compile("uk.ac.gate:mimir-core:@version@",
+ "uk.ac.gate:mimir-client:@version@")
// We must use the same version of Ant as the one provided by Grails
// For Grails 2.5, this is Ant 1.9.4
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
What NetFlow Analyzer can do for you? Monitors network bandwidth and traffic
patterns at an interface-level. Reveals which users, apps, and protocols are
consuming the most bandwidth. Provides multi-vendor support for NetFlow,
J-Flow, sFlow and other flows. Make informed decisions using capacity
planning reports. https://ad.doubleclick.net/ddm/clk/305295220;132659582;e
_______________________________________________
GATE-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gate-cvs
