You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by re...@apache.org on 2013/08/12 09:29:23 UTC
svn commit: r1513062 - in /clerezza/trunk/rdf.jena.tdb.storage/src:
main/java/org/apache/clerezza/rdf/jena/tdb/storage/
test/java/org/apache/clerezza/rdf/jena/tdb/storage/
Author: reto
Date: Mon Aug 12 07:29:22 2013
New Revision: 1513062
URL: http://svn.apache.org/r1513062
Log:
CLEREZZA-807: made scalable version the only and default single dataset TcProvider
Added:
clerezza/trunk/rdf.jena.tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetTcProvider.java
- copied, changed from r1513058, clerezza/trunk/rdf.jena.tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/ScalableSingleTdbDatasetTcProvider.java
clerezza/trunk/rdf.jena.tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetMGraphTest.java
- copied, changed from r1513058, clerezza/trunk/rdf.jena.tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/ScalableSingleTdbDatasetMGraphTest.java
clerezza/trunk/rdf.jena.tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetTcProviderTest.java
- copied, changed from r1513058, clerezza/trunk/rdf.jena.tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/ScalableSingleTdbDatasetTcProviderTest.java
Removed:
clerezza/trunk/rdf.jena.tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/ScalableSingleTdbDatasetTcProvider.java
clerezza/trunk/rdf.jena.tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/MultiThreadedScalableSingleTdbDatasetTest.java
clerezza/trunk/rdf.jena.tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/ScalableSingleTdbDatasetMGraphTest.java
clerezza/trunk/rdf.jena.tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/ScalableSingleTdbDatasetTcProviderTest.java
Copied: clerezza/trunk/rdf.jena.tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetTcProvider.java (from r1513058, clerezza/trunk/rdf.jena.tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/ScalableSingleTdbDatasetTcProvider.java)
URL: http://svn.apache.org/viewvc/clerezza/trunk/rdf.jena.tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetTcProvider.java?p2=clerezza/trunk/rdf.jena.tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetTcProvider.java&p1=clerezza/trunk/rdf.jena.tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/ScalableSingleTdbDatasetTcProvider.java&r1=1513058&r2=1513062&rev=1513062&view=diff
==============================================================================
--- clerezza/trunk/rdf.jena.tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/ScalableSingleTdbDatasetTcProvider.java (original)
+++ clerezza/trunk/rdf.jena.tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetTcProvider.java Mon Aug 12 07:29:22 2013
@@ -82,12 +82,12 @@ import com.hp.hpl.jena.tdb.TDBFactory;
configurationFactory=true, policy=ConfigurationPolicy.OPTIONAL)
@Service(WeightedTcProvider.class)
@Properties(value={
- @Property(name=ScalableSingleTdbDatasetTcProvider.TDB_DIR),
- @Property(name=ScalableSingleTdbDatasetTcProvider.DEFAULT_GRAPH_NAME),
- @Property(name=ScalableSingleTdbDatasetTcProvider.SYNC_INTERVAL, intValue=ScalableSingleTdbDatasetTcProvider.DEFAULT_SYNC_INTERVAL),
- @Property(name=ScalableSingleTdbDatasetTcProvider.WEIGHT, intValue=107)
+ @Property(name=SingleTdbDatasetTcProvider.TDB_DIR),
+ @Property(name=SingleTdbDatasetTcProvider.DEFAULT_GRAPH_NAME),
+ @Property(name=SingleTdbDatasetTcProvider.SYNC_INTERVAL, intValue=SingleTdbDatasetTcProvider.DEFAULT_SYNC_INTERVAL),
+ @Property(name=SingleTdbDatasetTcProvider.WEIGHT, intValue=107)
})
-public class ScalableSingleTdbDatasetTcProvider extends BaseTdbTcProvider implements WeightedTcProvider {
+public class SingleTdbDatasetTcProvider extends BaseTdbTcProvider implements WeightedTcProvider {
public static final String TDB_DIR = "tdb-dir";
public static final String DEFAULT_GRAPH_NAME = "default-graph-name";
@@ -98,7 +98,7 @@ public class ScalableSingleTdbDatasetTcP
public static final int DEFAULT_SYNC_INTERVAL = 6;
public static final int MIN_SYNC_INTERVAL = 3;
- private final Logger log = LoggerFactory.getLogger(ScalableSingleTdbDatasetTcProvider.class);
+ private final Logger log = LoggerFactory.getLogger(SingleTdbDatasetTcProvider.class);
private int weight;
private ModelGraph graphNameIndex;
@@ -155,7 +155,7 @@ public class ScalableSingleTdbDatasetTcP
/**
* Default constructor used by OSGI
*/
- public ScalableSingleTdbDatasetTcProvider(){}
+ public SingleTdbDatasetTcProvider(){}
/**
* Creates a TDB single dataset {@link TcProvider} based on the parsed
@@ -180,7 +180,7 @@ public class ScalableSingleTdbDatasetTcP
* @throws IOException the
* @throws ConfigurationException
*/
- public ScalableSingleTdbDatasetTcProvider(Dictionary<String,Object> config) throws ConfigurationException, IOException{
+ public SingleTdbDatasetTcProvider(Dictionary<String,Object> config) throws ConfigurationException, IOException{
activate(null,config);
}
/**
Copied: clerezza/trunk/rdf.jena.tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetMGraphTest.java (from r1513058, clerezza/trunk/rdf.jena.tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/ScalableSingleTdbDatasetMGraphTest.java)
URL: http://svn.apache.org/viewvc/clerezza/trunk/rdf.jena.tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetMGraphTest.java?p2=clerezza/trunk/rdf.jena.tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetMGraphTest.java&p1=clerezza/trunk/rdf.jena.tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/ScalableSingleTdbDatasetMGraphTest.java&r1=1513058&r2=1513062&rev=1513062&view=diff
==============================================================================
--- clerezza/trunk/rdf.jena.tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/ScalableSingleTdbDatasetMGraphTest.java (original)
+++ clerezza/trunk/rdf.jena.tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetMGraphTest.java Mon Aug 12 07:29:22 2013
@@ -12,7 +12,7 @@ import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.osgi.service.cm.ConfigurationException;
-public class ScalableSingleTdbDatasetMGraphTest extends MGraphTest {
+public class SingleTdbDatasetMGraphTest extends MGraphTest {
private static final String MGRAPHNAME_PREFIX = "http://text.example.org/testGraph";
private static UriRef UNION_GRAPH_NAME = new UriRef("http://www.example.org/unionGraph");
@@ -20,7 +20,7 @@ public class ScalableSingleTdbDatasetMGr
private static File tempFile;
private static Dictionary<String,Object> config;
- private static ScalableSingleTdbDatasetTcProvider provider;
+ private static SingleTdbDatasetTcProvider provider;
@BeforeClass
public static void setup() throws IOException, ConfigurationException {
@@ -28,9 +28,9 @@ public class ScalableSingleTdbDatasetMGr
tempFile.delete();
tempFile.mkdirs();
config = new Hashtable<String,Object>();
- config.put(ScalableSingleTdbDatasetTcProvider.TDB_DIR, tempFile.getAbsolutePath());
- config.put(ScalableSingleTdbDatasetTcProvider.DEFAULT_GRAPH_NAME, UNION_GRAPH_NAME.getUnicodeString());
- provider = new ScalableSingleTdbDatasetTcProvider(config);
+ config.put(SingleTdbDatasetTcProvider.TDB_DIR, tempFile.getAbsolutePath());
+ config.put(SingleTdbDatasetTcProvider.DEFAULT_GRAPH_NAME, UNION_GRAPH_NAME.getUnicodeString());
+ provider = new SingleTdbDatasetTcProvider(config);
}
@AfterClass
Copied: clerezza/trunk/rdf.jena.tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetTcProviderTest.java (from r1513058, clerezza/trunk/rdf.jena.tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/ScalableSingleTdbDatasetTcProviderTest.java)
URL: http://svn.apache.org/viewvc/clerezza/trunk/rdf.jena.tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetTcProviderTest.java?p2=clerezza/trunk/rdf.jena.tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetTcProviderTest.java&p1=clerezza/trunk/rdf.jena.tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/ScalableSingleTdbDatasetTcProviderTest.java&r1=1513058&r2=1513062&rev=1513062&view=diff
==============================================================================
--- clerezza/trunk/rdf.jena.tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/ScalableSingleTdbDatasetTcProviderTest.java (original)
+++ clerezza/trunk/rdf.jena.tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetTcProviderTest.java Mon Aug 12 07:29:22 2013
@@ -26,11 +26,11 @@ import org.junit.Before;
import org.junit.Test;
import org.osgi.service.cm.ConfigurationException;
-public class ScalableSingleTdbDatasetTcProviderTest extends TcProviderTest {
+public class SingleTdbDatasetTcProviderTest extends TcProviderTest {
private static File tempFile;
private static Dictionary<String,Object> config;
- private static ScalableSingleTdbDatasetTcProvider provider;
+ private static SingleTdbDatasetTcProvider provider;
private static UriRef UNION_GRAPH_NAME = new UriRef("http://www.example.org/unionGraph");
@Before
@@ -39,8 +39,8 @@ public class ScalableSingleTdbDatasetTcP
tempFile.delete();
tempFile.mkdirs();
config = new Hashtable<String,Object>();
- config.put(ScalableSingleTdbDatasetTcProvider.TDB_DIR, tempFile.getAbsolutePath());
- config.put(ScalableSingleTdbDatasetTcProvider.DEFAULT_GRAPH_NAME, UNION_GRAPH_NAME.getUnicodeString());
+ config.put(SingleTdbDatasetTcProvider.TDB_DIR, tempFile.getAbsolutePath());
+ config.put(SingleTdbDatasetTcProvider.DEFAULT_GRAPH_NAME, UNION_GRAPH_NAME.getUnicodeString());
//config.put(SingleTdbDatasetTcProvider.USE_GRAPH_NAME_SUFFIXES, true);
}
@@ -53,7 +53,7 @@ public class ScalableSingleTdbDatasetTcP
provider = null;
}
try {
- provider = new ScalableSingleTdbDatasetTcProvider(config);
+ provider = new SingleTdbDatasetTcProvider(config);
} catch (Exception e) {
throw new RuntimeException("forwarding ...",e);
}