svn commit: r1714252 - in /uima/sandbox/uima-ducc/trunk/src/main: admin/check_ducc admin/db_loader admin/db_util.py admin/ducc_post_install admin/ducc_util.py admin/stop_ducc resources/cassandra.yaml
Author: challngr
Date: Fri Nov 13 18:54:15 2015
New Revision: 1714252
URL: http://svn.apache.org/viewvc?rev=1714252&view=rev
Log:
UIMA-4577 Scripting and config updates.
Removed:
uima/sandbox/uima-ducc/trunk/src/main/resources/database.log.config
Modified:
uima/sandbox/uima-ducc/trunk/src/main/admin/check_ducc
uima/sandbox/uima-ducc/trunk/src/main/admin/db_loader
uima/sandbox/uima-ducc/trunk/src/main/admin/db_util.py
uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_post_install
uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_util.py
uima/sandbox/uima-ducc/trunk/src/main/admin/stop_ducc
uima/sandbox/uima-ducc/trunk/src/main/resources/cassandra.yaml
Modified: uima/sandbox/uima-ducc/trunk/src/main/admin/check_ducc
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/admin/check_ducc?rev=1714252&r1=1714251&r2=1714252&view=diff
==
--- uima/sandbox/uima-ducc/trunk/src/main/admin/check_ducc (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/admin/check_ducc Fri Nov 13 18:54:15
2015
@@ -350,7 +350,10 @@ class CheckDucc(DuccUtil):
self.threadpool.quit()
if ( self.kill_signal != None ):
+print 'Stopping broker'
self.stop_broker()
+print 'Stopping database'
+self.db_stop()
if ( len(self.pids) == 0):
if ( os.path.exists(self.pid_file) ):
Modified: uima/sandbox/uima-ducc/trunk/src/main/admin/db_loader
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/admin/db_loader?rev=1714252&r1=1714251&r2=1714252&view=diff
==
--- uima/sandbox/uima-ducc/trunk/src/main/admin/db_loader (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/admin/db_loader Fri Nov 13 18:54:15
2015
@@ -55,7 +55,7 @@ class DbLoader(DuccUtil):
print ' Specifies the DUCC_HOME of the DUCC runtime to be
moved into the database.'
print '-o dburl'
print ' Specifies the database URL to contact to store the
items.'
-print '--noarchive'
+print '--no-archive'
print ' Suppresses archival of the input files.'
print ''
print 'Notes:'
Modified: uima/sandbox/uima-ducc/trunk/src/main/admin/db_util.py
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/admin/db_util.py?rev=1714252&r1=1714251&r2=1714252&view=diff
==
--- uima/sandbox/uima-ducc/trunk/src/main/admin/db_util.py (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/admin/db_util.py Fri Nov 13 18:54:15
2015
@@ -26,6 +26,24 @@ def manual_config(DUCC_HOME, DUCC_HEAD):
print ''
print 'Note that one occurance of DUCC_HEAD will be quoted: you must
preserve these quotes, e.g. as "' + DUCC_HEAD + '".'
+def update_cassandra_config(DUCC_HOME, DUCC_HEAD):
+# Read cassandra.yaml and change the things necessary to configure it
correctly
+config = DUCC_HOME + '/cassandra-server/conf/cassandra.yaml'
+f = open(config)
+lines = []
+for line in f:
+if ( line.startswith('listen_address:') ):
+line = line.strip();
+print 'Database host is configured at', line
+if ( not DUCC_HEAD in line ):
+print 'Must reconfigure listen_address to', DUCC_HEAD
+parts = line.strip().split(':')
+old = parts[1].strip()
+ch_head = "sed -i.bak s'/" + old + "/" + DUCC_HEAD + "'/ " +
config
+os.system(ch_head)
+
+
+
def configure_database(DUCC_HOME, DUCC_HEAD, java, db_pw):
# for cassandra:
# in ducc_runtime/cassandra-server/conf we need to update cassandra.yaml
to establish
@@ -50,22 +68,7 @@ def configure_database(DUCC_HOME, DUCC_H
print 'Database support will be bypassed'
return True
-config = DUCC_HOME + '/cassandra-server/conf/cassandra.yaml'
-esc_home = DUCC_HOME.replace("/", "\/")# for sed
-
-# must configure the database node to be the same as the ducc head, and
the database location
-# to be DUCC_HEAD
-ch_head = "sed -i.bak s'/DUCC_HEAD/" + DUCC_HEAD + "'/ " + config
-if ( execute(ch_head) != 0 ):
-print 'Could not configure', config + '. You may need to recover it
from', config+'.bak.'
-manual_config(DUCC_HOME, DUCC_HEAD)
-return False
-
-ch_home = "sed -i.bak s'/DUCC_HOME/" + esc_home + "'/ " + config
-if ( execute(ch_home) != 0):
-print 'Could not configure', config + '. You may need to recover it
from', config+'.bak.'
-manual_config(DUCC_HOME, DUCC_HEAD)
-return False
+update_cassandra_config(DUCC_HOME, DUCC_HEAD)
here = os.getcwd()
os.chdir(DUCC_HOME + "/cassandra-server")
Modified: uima/sandbo
svn commit: r1714245 - in /uima/ruta/branches/UIMA-4408/ruta-core/src/main: antlr3/org/apache/uima/ruta/parser/ java/org/apache/uima/ruta/ java/org/apache/uima/ruta/action/ java/org/apache/uima/ruta/c
Author: pkluegl
Date: Fri Nov 13 18:09:27 2015
New Revision: 1714245
URL: http://svn.apache.org/viewvc?rev=1714245&view=rev
Log:
UIMA-4408 + UIMA-4683
- towards general annotation expression handling in ruta
Added:
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/AnnotationTypeExpression.java
(with props)
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/annotation/AnnotationFeatureExpression.java
(with props)
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/annotation/AnnotationFunctionExpression.java
(with props)
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaAnnotationFunctionExtension.java
(with props)
Modified:
uima/ruta/branches/UIMA-4408/ruta-core/src/main/antlr3/org/apache/uima/ruta/parser/RutaParser.g
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/RutaScriptFactory.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/AbstractStructureAction.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/ImplicitFeatureAction.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/SetFeatureAction.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/condition/FeatureCondition.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/condition/ImplicitCondition.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/ExpressionFactory.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/MatchReference.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/annotation/AbstractAnnotationExpression.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/feature/FeatureExpression.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/feature/FeatureMatchExpression.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/feature/GenericFeatureExpression.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/feature/SimpleFeatureExpression.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/extensions/RutaExternalFactory.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/rule/RutaRuleElement.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/rule/RutaTypeMatcher.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/verbalize/ExpressionVerbalizer.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/verbalize/ScriptVerbalizer.java
Modified:
uima/ruta/branches/UIMA-4408/ruta-core/src/main/antlr3/org/apache/uima/ruta/parser/RutaParser.g
URL:
http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4408/ruta-core/src/main/antlr3/org/apache/uima/ruta/parser/RutaParser.g?rev=1714245&r1=1714244&r2=1714245&view=diff
==
---
uima/ruta/branches/UIMA-4408/ruta-core/src/main/antlr3/org/apache/uima/ruta/parser/RutaParser.g
(original)
+++
uima/ruta/branches/UIMA-4408/ruta-core/src/main/antlr3/org/apache/uima/ruta/parser/RutaParser.g
Fri Nov 13 18:09:27 2015
@@ -399,6 +399,9 @@ public void setExternalFactory(RutaExter
private boolean isTypeFunctionExtension(String name) {
return external.getTypeFunctionExtensions().keySet().contains(name);
}
+ private boolean isAnnotationFunctionExtension(String name) {
+ return
external.getAnnotationFunctionExtensions().keySet().contains(name);
+ }
private boolean isBlockExtension(String name) {
return external.getBlockExtensions().keySet().contains(name);
}
@@ -1148,16 +1151,16 @@ typeMatchExpression returns [IRutaExpres
options {
backtrack = true;
}
- :
- (typeFunction)=> tf = typeFunction {expr = tf;}
+ :
+ (featureMatchExpression)=> fme = featureMatchExpression {expr = fme;}
|
- (matchReference)=> mr = matchReference {expr = mr;}
+ (typeExpression)=> te = typeExpression {expr = te;}
;
matchReference returns [MatchReference mr = null]
:
- ref = dottedId ((comp = LESS | comp = GREATER | comp = GREATEREQUAL |
comp = LESSEQUAL |comp = EQUAL | comp = NOTEQUAL) arg = argument)?
- {mr = ExpressionFactory.createMatchReference(ref, comp, arg);}
+ ref = dottedId
+ {mr = ExpressionFactory.createMatchReference(ref);}
;
typeExpression return
