You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by de...@apache.org on 2014/06/13 22:47:15 UTC
svn commit: r1602517 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common:
IDuccEnv.java utils/DuccPropertiesResolver.java
Author: degenaro
Date: Fri Jun 13 20:47:15 2014
New Revision: 1602517
URL: http://svn.apache.org/r1602517
Log:
UIMA-3892 DUCC needs a file for private configuration data
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/IDuccEnv.java
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccPropertiesResolver.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/IDuccEnv.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/IDuccEnv.java?rev=1602517&r1=1602516&r2=1602517&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/IDuccEnv.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/IDuccEnv.java Fri Jun 13 20:47:15 2014
@@ -26,6 +26,8 @@ public interface IDuccEnv {
public static final String DUCC_HOME_DIR = DUCC_HOME+File.separator;
public static final String DUCC_RESOURCES_DIR = DUCC_HOME_DIR+"resources"+File.separator;
+ public static final String DUCC_PRIVATE_DIR = DUCC_HOME_DIR+"private"+File.separator;
+ public static final String DUCC_PRIVATE_PROPERTIES_FILE = DUCC_PRIVATE_DIR+"ducc.private.properties";
public static final String DUCC_PROPERTIES_FILE = DUCC_RESOURCES_DIR+"ducc.properties";
public static final String DUCC_NODES_FILE_NAME = "ducc.nodes";
public static final String DUCC_NODES_FILE_PATH = DUCC_RESOURCES_DIR+DUCC_NODES_FILE_NAME;
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccPropertiesResolver.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccPropertiesResolver.java?rev=1602517&r1=1602516&r2=1602517&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccPropertiesResolver.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccPropertiesResolver.java Fri Jun 13 20:47:15 2014
@@ -22,6 +22,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
+import java.util.Map.Entry;
import java.util.Properties;
import org.apache.uima.ducc.common.IDuccEnv;
@@ -160,6 +161,37 @@ public class DuccPropertiesResolver {
catch (IOException e) {
System.out.println("Error reading file: "+IDuccEnv.DUCC_PROPERTIES_FILE);
}
+ enrich(properties);
+ }
+
+ private void enrich(Properties properties) {
+ String location = "enrich";
+ // add or override with ducc.private.properties
+ Properties privateProperties = getPrivateProperties();
+ for(Entry<Object, Object> entry : privateProperties.entrySet()) {
+ System.out.println(location+": "+entry.getKey()+"="+entry.getValue());
+ properties.put(entry.getKey(), entry.getValue());
+ }
+ }
+
+ private Properties getPrivateProperties() {
+ //String methodName = "getPrivateProperties";
+ Properties privateProperties = new Properties();
+ String fileName = IDuccEnv.DUCC_PRIVATE_PROPERTIES_FILE;
+ try {
+ File file = new File(fileName);
+ FileInputStream fis;
+ fis = new FileInputStream(file);
+ privateProperties.load(fis);
+ fis.close();
+ }
+ catch (FileNotFoundException e) {
+ //System.out.println(methodName+" "+"File not found: "+fileName);
+ }
+ catch (IOException e) {
+ //System.out.println(methodName+" "+"Error reading file: "+fileName);
+ }
+ return privateProperties;
}
public String getProperty(String key) {