Revision: 14644
http://gate.svn.sourceforge.net/gate/?rev=14644&view=rev
Author: valyt
Date: 2011-12-02 11:42:55 +0000 (Fri, 02 Dec 2011)
Log Message:
-----------
Bringing in changes from 3.4. branch:
- all source files compiled as UTF-8
- added tmpDir option to MimirConfig.groovy (useful as an example)
- new version number for mimir-cloud
- all params for MimirIndexingPR are now runtime.
Modified Paths:
--------------
mimir/trunk/mimir-client/build.xml
mimir/trunk/mimir-client/src/gate/mimir/index/MimirIndexingPR.java
mimir/trunk/mimir-cloud/application.properties
mimir/trunk/mimir-cloud/grails-app/conf/MimirConfig.groovy
mimir/trunk/mimir-core/build.xml
mimir/trunk/mimir-test/.classpath
mimir/trunk/mimir-test/.project
mimir/trunk/mimir-test/build.xml
mimir/trunk/plugins/db-h2/build.xml
mimir/trunk/plugins/measurements/build.xml
mimir/trunk/plugins/sesame/build.xml
mimir/trunk/plugins/sparql/build.xml
Property Changed:
----------------
mimir/trunk/
mimir/trunk/mimir-client/
mimir/trunk/mimir-core/src/
mimir/trunk/mimir-web/
Property changes on: mimir/trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /mimir/branches/4.x:14298-14348
+ /mimir/branches/3.4:14623,14634-14643
/mimir/branches/4.x:14298-14348
Property changes on: mimir/trunk/mimir-client
___________________________________________________________________
Modified: svn:ignore
- mimir-client-*.jar
classes
+ mimir-client-*.jar
classes
creole.xml
Modified: mimir/trunk/mimir-client/build.xml
===================================================================
--- mimir/trunk/mimir-client/build.xml 2011-12-02 11:32:05 UTC (rev 14643)
+++ mimir/trunk/mimir-client/build.xml 2011-12-02 11:42:55 UTC (rev 14644)
@@ -40,6 +40,7 @@
debug="true"
target="1.6"
source="1.6"
+ encoding="UTF-8"
classpathref="compile.classpath" />
</target>
Modified: mimir/trunk/mimir-client/src/gate/mimir/index/MimirIndexingPR.java
===================================================================
--- mimir/trunk/mimir-client/src/gate/mimir/index/MimirIndexingPR.java
2011-12-02 11:32:05 UTC (rev 14643)
+++ mimir/trunk/mimir-client/src/gate/mimir/index/MimirIndexingPR.java
2011-12-02 11:42:55 UTC (rev 14644)
@@ -61,8 +61,11 @@
@CreoleParameter(comment="Username for authenticating to the Mímir server.
Leave empty if no authentication is required.")
@Optional
+ @RunTime
public void setMimirUsername(String mimirUsername) {
this.mimirUsername = mimirUsername;
+ // invalidate the connector
+ this.mimirConnector = null;
}
public String getMimirPassword() {
@@ -71,8 +74,11 @@
@CreoleParameter(comment="Password for authenticating to the Mímir server.
Leave empty if no authentication is required.")
@Optional
+ @RunTime
public void setMimirPassword(String mimirPassword) {
this.mimirPassword = mimirPassword;
+ // invalidate the connector
+ this.mimirConnector = null;
}
@Override
@@ -81,22 +87,22 @@
}
@Override
- public Resource init() throws ResourceInstantiationException {
- super.init();
- WebUtils webUtils = null;
- if(mimirUsername != null && mimirUsername.length() > 0) {
- webUtils = new WebUtils(mimirUsername, mimirPassword);
- }
- mimirConnector = webUtils == null ? new MimirConnector() : new
MimirConnector(webUtils);
- return this;
- }
-
- @Override
public void execute() throws ExecutionException {
try {
+ if(mimirConnector == null) {
+ // first run or config has changed: [re-]create
+ if(mimirUsername != null && mimirUsername.length() > 0) {
+ mimirConnector = new MimirConnector(
+ new WebUtils(mimirUsername, mimirPassword));
+ } else {
+ mimirConnector = new MimirConnector();
+ }
+ }
+
mimirConnector.sendToMimir(getDocument(), null, mimirIndexUrl);
} catch(IOException e) {
- throw new ExecutionException("Error communicating with the Mímir
server", e);
+ throw new ExecutionException(
+ "Error communicating with the Mímir server", e);
}
}
Modified: mimir/trunk/mimir-cloud/application.properties
===================================================================
--- mimir/trunk/mimir-cloud/application.properties 2011-12-02 11:32:05 UTC
(rev 14643)
+++ mimir/trunk/mimir-cloud/application.properties 2011-12-02 11:42:55 UTC
(rev 14644)
@@ -3,7 +3,7 @@
app.grails.version=1.3.7
app.name=mimir-cloud
app.servlet.version=2.4
-app.version=1.0-20111114
+app.version=1.1-20111202
plugins.background-thread=1.6
plugins.hibernate=1.3.7
plugins.spring-security-core=1.2.4
Modified: mimir/trunk/mimir-cloud/grails-app/conf/MimirConfig.groovy
===================================================================
--- mimir/trunk/mimir-cloud/grails-app/conf/MimirConfig.groovy 2011-12-02
11:32:05 UTC (rev 14643)
+++ mimir/trunk/mimir-cloud/grails-app/conf/MimirConfig.groovy 2011-12-02
11:42:55 UTC (rev 14644)
@@ -21,10 +21,10 @@
// specified locations for run-app and will be packaged into the WAR for
// deployment.
plugins {
- dbh2 = "../../mimir/plugins/db-h2"
- measurements = "../../mimir/plugins/measurements"
- sesame = "../../mimir/plugins/sesame"
- sparql = "../../mimir/plugins/sparql"
+ dbh2 = "../plugins/db-h2"
+ measurements = "../plugins/measurements"
+ sesame = "../plugins/sesame"
+ sparql = "../plugins/sparql"
}
// the xgapp file that defines the query tokeniser. Alternatively
@@ -34,3 +34,7 @@
// the base directory in which newly created local indexes will
// be put.
indexBaseDirectory = "/data/home/gate/mimir-indexes"
+
+// this directory is used for storing temporary files (such as index archives
+// prepared for download)
+tempDir="/data/home/gate/mimir-archives"
Modified: mimir/trunk/mimir-core/build.xml
===================================================================
--- mimir/trunk/mimir-core/build.xml 2011-12-02 11:32:05 UTC (rev 14643)
+++ mimir/trunk/mimir-core/build.xml 2011-12-02 11:42:55 UTC (rev 14644)
@@ -35,6 +35,7 @@
debug="true"
target="1.6"
source="1.6"
+ encoding="UTF-8"
classpathref="compile.classpath" />
</target>
Property changes on: mimir/trunk/mimir-core/src
___________________________________________________________________
Modified: svn:mergeinfo
- /mimir/branches/3.4/mimir-core/src:14623
/mimir/branches/4.x/mimir-core/src:14299-14316
+ /mimir/branches/3.4/mimir-core/src:14623,14634-14643
/mimir/branches/4.x/mimir-core/src:14299-14316
Modified: mimir/trunk/mimir-test/.classpath
===================================================================
--- mimir/trunk/mimir-test/.classpath 2011-12-02 11:32:05 UTC (rev 14643)
+++ mimir/trunk/mimir-test/.classpath 2011-12-02 11:42:55 UTC (rev 14644)
@@ -5,5 +5,7 @@
<classpathentry combineaccessrules="false" kind="src"
path="/mimir-core"/>
<classpathentry kind="lib" path="lib/junit-4.1.jar"/>
<classpathentry kind="lib" path="conf"/>
+ <classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>
+ <classpathentry exported="true" kind="con" path="GROOVY_DSL_SUPPORT"/>
<classpathentry kind="output" path="classes"/>
</classpath>
Modified: mimir/trunk/mimir-test/.project
===================================================================
--- mimir/trunk/mimir-test/.project 2011-12-02 11:32:05 UTC (rev 14643)
+++ mimir/trunk/mimir-test/.project 2011-12-02 11:42:55 UTC (rev 14644)
@@ -17,6 +17,7 @@
</buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.jdt.groovy.core.groovyNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
</natures>
Modified: mimir/trunk/mimir-test/build.xml
===================================================================
--- mimir/trunk/mimir-test/build.xml 2011-12-02 11:32:05 UTC (rev 14643)
+++ mimir/trunk/mimir-test/build.xml 2011-12-02 11:42:55 UTC (rev 14644)
@@ -39,6 +39,7 @@
debug="true"
target="1.6"
source="1.6"
+ encoding="UTF-8"
classpathref="compile.classpath" />
</target>
Property changes on: mimir/trunk/mimir-web
___________________________________________________________________
Modified: svn:mergeinfo
- /mimir/branches/3.4/mimir-web:14546,14623
+ /mimir/branches/3.4/mimir-web:14546,14623,14634-14643
Modified: mimir/trunk/plugins/db-h2/build.xml
===================================================================
--- mimir/trunk/plugins/db-h2/build.xml 2011-12-02 11:32:05 UTC (rev 14643)
+++ mimir/trunk/plugins/db-h2/build.xml 2011-12-02 11:42:55 UTC (rev 14644)
@@ -47,6 +47,7 @@
debug="true"
target="1.6"
source="1.6"
+ encoding="UTF-8"
classpathref="compile.classpath" />
</target>
Modified: mimir/trunk/plugins/measurements/build.xml
===================================================================
--- mimir/trunk/plugins/measurements/build.xml 2011-12-02 11:32:05 UTC (rev
14643)
+++ mimir/trunk/plugins/measurements/build.xml 2011-12-02 11:42:55 UTC (rev
14644)
@@ -46,6 +46,7 @@
debug="true"
target="1.6"
source="1.6"
+ encoding="UTF-8"
classpathref="compile.classpath" />
</target>
Modified: mimir/trunk/plugins/sesame/build.xml
===================================================================
--- mimir/trunk/plugins/sesame/build.xml 2011-12-02 11:32:05 UTC (rev
14643)
+++ mimir/trunk/plugins/sesame/build.xml 2011-12-02 11:42:55 UTC (rev
14644)
@@ -48,6 +48,7 @@
debug="true"
target="1.6"
source="1.6"
+ encoding="UTF-8"
classpathref="compile.classpath" />
</target>
Modified: mimir/trunk/plugins/sparql/build.xml
===================================================================
--- mimir/trunk/plugins/sparql/build.xml 2011-12-02 11:32:05 UTC (rev
14643)
+++ mimir/trunk/plugins/sparql/build.xml 2011-12-02 11:42:55 UTC (rev
14644)
@@ -37,6 +37,7 @@
debug="true"
target="1.6"
source="1.6"
+ encoding="UTF-8"
classpathref="compile.classpath" />
</target>
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure
contains a definitive record of customers, application performance,
security threats, fraudulent activity, and more. Splunk takes this
data and makes sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-novd2d
_______________________________________________
GATE-cvs mailing list
GATE-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/gate-cvs
