Author: degenaro
Date: Wed Jul 18 18:44:45 2018
New Revision: 1836218
URL: http://svn.apache.org/viewvc?rev=1836218&view=rev
Log:
UIMA-5742 Reliable DUCC - make some DB attributes public for access by related
packages (of the future)
Modified:
uima/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbCreate.java
uima/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbHandle.java
uima/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbUtil.java
Modified:
uima/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbCreate.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbCreate.java?rev=1836218&r1=1836217&r2=1836218&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbCreate.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbCreate.java
Wed Jul 18 18:44:45 2018
@@ -40,7 +40,7 @@ import com.datastax.driver.core.exceptio
public class DbCreate
{
- static final String DUCC_KEYSPACE = "ducc";
+ public static final String DUCC_KEYSPACE = "ducc";
static final String PASSWORD_KEY = "db_password";
static final String PASSWORD_FILE = "ducc.private.properties";
int RETRY = 10;
Modified:
uima/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbHandle.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbHandle.java?rev=1836218&r1=1836217&r2=1836218&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbHandle.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbHandle.java
Wed Jul 18 18:44:45 2018
@@ -65,7 +65,7 @@ public class DbHandle
return manager.execute(s);
}
- ResultSet execute(PreparedStatement ps, Object ... fields)
+ public ResultSet execute(PreparedStatement ps, Object ... fields)
throws Exception
{
String methodName = "execute";
@@ -259,7 +259,7 @@ public class DbHandle
}
- PreparedStatement prepare(String cql)
+ public PreparedStatement prepare(String cql)
{
//String methodName = "prepare";
return manager.prepare(cql);
Modified:
uima/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbUtil.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbUtil.java?rev=1836218&r1=1836217&r2=1836218&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbUtil.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbUtil.java
Wed Jul 18 18:44:45 2018
@@ -31,12 +31,10 @@ import com.datastax.driver.core.Row;
/**
* Static common helper methods.
- *
- * Not public at this point, would prefer to encapsulate all this entirely in
DB.
*/
-class DbUtil
+public class DbUtil
{
- static String mkSchema(IDbProperty[] props)
+ public static String mkSchema(IDbProperty[] props)
throws Exception
{
List<String> parts = new ArrayList<String>();
@@ -87,7 +85,7 @@ class DbUtil
return ret;
}
- static List<String> mkIndices(IDbProperty[] props, String tablename)
+ public static List<String> mkIndices(IDbProperty[] props, String tablename)
{
List<String> ret = new ArrayList<String>();
for ( IDbProperty p : props ) {