Repository: incubator-rya Updated Branches: refs/heads/master bd9b91241 -> be9ea9a37
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/be9ea9a3/extras/indexingExample/src/main/java/MongoRyaDirectExample.java ---------------------------------------------------------------------- diff --git a/extras/indexingExample/src/main/java/MongoRyaDirectExample.java b/extras/indexingExample/src/main/java/MongoRyaDirectExample.java index b0fbdbd..32de913 100644 --- a/extras/indexingExample/src/main/java/MongoRyaDirectExample.java +++ b/extras/indexingExample/src/main/java/MongoRyaDirectExample.java @@ -50,6 +50,8 @@ import com.mongodb.ServerAddress; import org.apache.rya.api.RdfCloudTripleStoreConfiguration; import org.apache.rya.indexing.GeoConstants; import org.apache.rya.indexing.accumulo.ConfigUtils; +import org.apache.rya.indexing.mongodb.MongoIndexingConfiguration; +import org.apache.rya.indexing.mongodb.MongoIndexingConfiguration.MongoDBIndexingConfigBuilder; import org.apache.rya.mongodb.MockMongoFactory; import org.apache.rya.mongodb.MongoConnectorFactory; import org.apache.rya.mongodb.MongoDBRdfConfiguration; @@ -268,8 +270,8 @@ public class MongoRyaDirectExample { private static MockMongoFactory mock = null; private static Configuration getConf() throws IOException { - MongoDBRdfConfiguration conf = new MongoDBRdfConfiguration(); - conf.set(ConfigUtils.USE_MONGO, "true"); + MongoDBIndexingConfigBuilder builder = MongoIndexingConfiguration.builder() + .setUseMockMongo(USE_MOCK).setUseInference(USE_INFER).setAuths("U"); if (USE_MOCK) { mock = MockMongoFactory.newFactory(); @@ -278,26 +280,20 @@ public class MongoRyaDirectExample { String url = address.getHost(); String port = Integer.toString(address.getPort()); c.close(); - conf.set(MongoDBRdfConfiguration.MONGO_INSTANCE, url); - conf.set(MongoDBRdfConfiguration.MONGO_INSTANCE_PORT, port); + builder.setMongoHost(url).setMongoPort(port); } else { // User name and password must be filled in: - conf.set(MongoDBRdfConfiguration.MONGO_USER, "fill this in"); - conf.set(MongoDBRdfConfiguration.MONGO_USER_PASSWORD, "fill this in"); - conf.set(MongoDBRdfConfiguration.MONGO_INSTANCE, MONGO_INSTANCE_URL); - conf.set(MongoDBRdfConfiguration.MONGO_INSTANCE_PORT, MONGO_INSTANCE_PORT); + builder = builder.setMongoUser("fill this in") + .setMongoPassword("fill this in") + .setMongoHost(MONGO_INSTANCE_URL) + .setMongoPort(MONGO_INSTANCE_PORT); } - conf.set(MongoDBRdfConfiguration.MONGO_DB_NAME, MONGO_DB); - conf.set(MongoDBRdfConfiguration.MONGO_COLLECTION_PREFIX, MONGO_COLL_PREFIX); - conf.set(ConfigUtils.GEO_PREDICATES_LIST, "http://www.opengis.net/ont/geosparql#asWKT";); -// conf.set(ConfigUtils.USE_GEO, "true"); - conf.set(ConfigUtils.USE_FREETEXT, "true"); - conf.setTablePrefix(MONGO_COLL_PREFIX); - conf.set(ConfigUtils.GEO_PREDICATES_LIST, GeoConstants.GEO_AS_WKT.stringValue()); - conf.set(ConfigUtils.FREETEXT_PREDICATES_LIST, RDFS.LABEL.stringValue()); - conf.set(ConfigUtils.FREETEXT_PREDICATES_LIST, RDFS.LABEL.stringValue()); - conf.set(RdfCloudTripleStoreConfiguration.CONF_INFER, Boolean.toString(USE_INFER)); - return conf; + + return builder.setMongoDBName(MONGO_DB) + .setMongoCollectionPrefix(MONGO_COLL_PREFIX) + .setUseMongoFreetextIndex(true) + .setMongoFreeTextPredicates(RDFS.LABEL.stringValue()).build(); + } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/be9ea9a3/extras/indexingExample/src/main/java/RyaClientExample.java ---------------------------------------------------------------------- diff --git a/extras/indexingExample/src/main/java/RyaClientExample.java b/extras/indexingExample/src/main/java/RyaClientExample.java index 1c0a3b6..1b0450f 100644 --- a/extras/indexingExample/src/main/java/RyaClientExample.java +++ b/extras/indexingExample/src/main/java/RyaClientExample.java @@ -27,17 +27,30 @@ import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.minicluster.MiniAccumuloCluster; import org.apache.accumulo.minicluster.MiniAccumuloConfig; import org.apache.commons.lang3.StringUtils; +import org.apache.fluo.api.client.FluoAdmin; +import org.apache.fluo.api.client.FluoAdmin.AlreadyInitializedException; +import org.apache.fluo.api.client.FluoAdmin.TableExistsException; +import org.apache.fluo.api.client.FluoFactory; +import org.apache.fluo.api.config.FluoConfiguration; +import org.apache.fluo.api.config.ObserverSpecification; +import org.apache.fluo.api.mini.MiniFluo; import org.apache.log4j.ConsoleAppender; import org.apache.log4j.Level; import org.apache.log4j.LogManager; import org.apache.log4j.Logger; import org.apache.log4j.PatternLayout; +import org.apache.rya.api.client.Install.InstallConfiguration; +import org.apache.rya.api.client.RyaClient; +import org.apache.rya.api.client.accumulo.AccumuloConnectionDetails; +import org.apache.rya.api.client.accumulo.AccumuloRyaClientFactory; +import org.apache.rya.indexing.accumulo.AccumuloIndexingConfiguration; import org.apache.rya.indexing.pcj.fluo.app.export.rya.RyaExportParameters; import org.apache.rya.indexing.pcj.fluo.app.observers.FilterObserver; import org.apache.rya.indexing.pcj.fluo.app.observers.JoinObserver; import org.apache.rya.indexing.pcj.fluo.app.observers.QueryResultObserver; import org.apache.rya.indexing.pcj.fluo.app.observers.StatementPatternObserver; import org.apache.rya.indexing.pcj.fluo.app.observers.TripleObserver; +import org.apache.rya.sail.config.RyaSailFactory; import org.apache.zookeeper.ClientCnxn; import org.openrdf.model.Statement; import org.openrdf.model.ValueFactory; @@ -53,23 +66,8 @@ import com.beust.jcommander.internal.Lists; import com.google.common.io.Files; import info.aduna.iteration.CloseableIteration; -import org.apache.fluo.api.client.FluoAdmin; -import org.apache.fluo.api.client.FluoAdmin.AlreadyInitializedException; -import org.apache.fluo.api.client.FluoAdmin.TableExistsException; -import org.apache.fluo.api.client.FluoFactory; -import org.apache.fluo.api.config.FluoConfiguration; -import org.apache.fluo.api.config.ObserverSpecification; -import org.apache.fluo.api.mini.MiniFluo; -import org.apache.rya.accumulo.AccumuloRdfConfiguration; -import org.apache.rya.api.client.Install.InstallConfiguration; -import org.apache.rya.api.client.RyaClient; -import org.apache.rya.api.client.accumulo.AccumuloConnectionDetails; -import org.apache.rya.api.client.accumulo.AccumuloRyaClientFactory; -import org.apache.rya.indexing.accumulo.ConfigUtils; -import org.apache.rya.indexing.external.PrecomputedJoinIndexerConfig; -import org.apache.rya.sail.config.RyaSailFactory; -/** +/** * Demonstrates how a {@link RyaClient} may be used to interact with an instance * of Accumulo to install and manage a Rya instance. */ @@ -132,18 +130,17 @@ public class RyaClientExample { "}"; // Load some statements into the Rya instance. - final AccumuloRdfConfiguration conf = new AccumuloRdfConfiguration(); - conf.setTablePrefix(ryaInstanceName); - conf.set(ConfigUtils.CLOUDBASE_USER, accumuloUsername); - conf.set(ConfigUtils.CLOUDBASE_PASSWORD, accumuloPassword); - conf.set(ConfigUtils.CLOUDBASE_INSTANCE, cluster.getInstanceName()); - conf.set(ConfigUtils.CLOUDBASE_ZOOKEEPERS, cluster.getZooKeepers()); - conf.set(ConfigUtils.CLOUDBASE_AUTHS, "U"); - conf.set(ConfigUtils.USE_PCJ_FLUO_UPDATER, "true"); - conf.set(ConfigUtils.FLUO_APP_NAME, fluoAppName); - conf.set(ConfigUtils.PCJ_STORAGE_TYPE, PrecomputedJoinIndexerConfig.PrecomputedJoinStorageType.ACCUMULO.toString()); - conf.set(ConfigUtils.PCJ_UPDATER_TYPE, PrecomputedJoinIndexerConfig.PrecomputedJoinUpdaterType.FLUO.toString()); - + + AccumuloIndexingConfiguration conf = AccumuloIndexingConfiguration.builder() + .setAuths("U") + .setAccumuloUser(accumuloUsername) + .setAccumuloPassword(accumuloPassword) + .setAccumuloInstance(cluster.getInstanceName()) + .setAccumuloZooKeepers(cluster.getZooKeepers()) + .setRyaPrefix(ryaInstanceName) + .setPcjUpdaterFluoAppName(fluoAppName) + .build(); + ryaSail = RyaSailFactory.getInstance(conf); final ValueFactory vf = ryaSail.getValueFactory(); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/be9ea9a3/extras/indexingExample/src/main/java/RyaDirectExample.java ---------------------------------------------------------------------- diff --git a/extras/indexingExample/src/main/java/RyaDirectExample.java b/extras/indexingExample/src/main/java/RyaDirectExample.java index 4b5e042..d2aa1f6 100644 --- a/extras/indexingExample/src/main/java/RyaDirectExample.java +++ b/extras/indexingExample/src/main/java/RyaDirectExample.java @@ -19,20 +19,33 @@ import java.net.UnknownHostException; import java.util.List; +import java.util.Map; import org.apache.accumulo.core.client.AccumuloException; import org.apache.accumulo.core.client.AccumuloSecurityException; import org.apache.accumulo.core.client.Connector; +import org.apache.accumulo.core.client.Scanner; import org.apache.accumulo.core.client.TableExistsException; import org.apache.accumulo.core.client.TableNotFoundException; import org.apache.accumulo.core.client.mock.MockInstance; import org.apache.accumulo.core.client.security.tokens.PasswordToken; +import org.apache.accumulo.core.data.Key; +import org.apache.accumulo.core.data.Value; +import org.apache.accumulo.core.security.Authorizations; import org.apache.commons.lang.Validate; import org.apache.hadoop.conf.Configuration; import org.apache.log4j.Logger; +import org.apache.rya.accumulo.AccumuloRdfConfiguration; +import org.apache.rya.api.persist.RyaDAOException; +import org.apache.rya.indexing.accumulo.AccumuloIndexingConfiguration; +import org.apache.rya.indexing.accumulo.ConfigUtils; +import org.apache.rya.indexing.external.PrecomputedJoinIndexerConfig; +import org.apache.rya.indexing.external.PrecomputedJoinIndexerConfig.PrecomputedJoinStorageType; import org.apache.rya.indexing.pcj.storage.PcjException; import org.apache.rya.indexing.pcj.storage.accumulo.PcjTables; import org.apache.rya.indexing.pcj.storage.accumulo.PcjVarOrderFactory; +import org.apache.rya.rdftriplestore.inference.InferenceEngineException; +import org.apache.rya.sail.config.RyaSailFactory; import org.openrdf.model.URI; import org.openrdf.model.ValueFactory; import org.openrdf.model.impl.LiteralImpl; @@ -57,16 +70,6 @@ import org.openrdf.sail.SailException; import com.google.common.base.Optional; -import org.apache.rya.accumulo.AccumuloRdfConfiguration; -import org.apache.rya.api.RdfCloudTripleStoreConfiguration; -import org.apache.rya.api.persist.RyaDAOException; -import org.apache.rya.indexing.GeoConstants; -import org.apache.rya.indexing.accumulo.ConfigUtils; -import org.apache.rya.indexing.external.PrecomputedJoinIndexerConfig; -import org.apache.rya.indexing.external.PrecomputedJoinIndexerConfig.PrecomputedJoinStorageType; -import org.apache.rya.rdftriplestore.inference.InferenceEngineException; -import org.apache.rya.sail.config.RyaSailFactory; - public class RyaDirectExample { private static final Logger log = Logger.getLogger(RyaDirectExample.class); @@ -82,6 +85,7 @@ public class RyaDirectExample { public static void main(final String[] args) throws Exception { final Configuration conf = getConf(); + conf.set(PrecomputedJoinIndexerConfig.PCJ_STORAGE_TYPE, PrecomputedJoinStorageType.ACCUMULO.name()); conf.setBoolean(ConfigUtils.DISPLAY_QUERY_PLAN, PRINT_QUERIES); log.info("Creating the tables as root."); @@ -149,24 +153,19 @@ public class RyaDirectExample { private static Configuration getConf() { - final AccumuloRdfConfiguration conf = new AccumuloRdfConfiguration(); - - conf.setBoolean(ConfigUtils.USE_MOCK_INSTANCE, USE_MOCK_INSTANCE); - conf.set(ConfigUtils.USE_PCJ, "true"); - conf.set(ConfigUtils.USE_FREETEXT, "true"); - conf.set(ConfigUtils.USE_TEMPORAL, "true"); - conf.set(PrecomputedJoinIndexerConfig.PCJ_STORAGE_TYPE, PrecomputedJoinStorageType.ACCUMULO.name()); - conf.set(RdfCloudTripleStoreConfiguration.CONF_TBL_PREFIX, RYA_TABLE_PREFIX); - conf.set(ConfigUtils.CLOUDBASE_USER, "root"); - conf.set(ConfigUtils.CLOUDBASE_PASSWORD, ""); - conf.set(ConfigUtils.CLOUDBASE_INSTANCE, INSTANCE); - conf.setInt(ConfigUtils.NUM_PARTITIONS, 3); - conf.set(ConfigUtils.CLOUDBASE_AUTHS, AUTHS); - - // only geo index statements with geo:asWKT predicates - conf.set(ConfigUtils.GEO_PREDICATES_LIST, - GeoConstants.GEO_AS_WKT.stringValue()); - return conf; + + return AccumuloIndexingConfiguration.builder() + .setUseMockAccumulo(USE_MOCK_INSTANCE) + .setAuths(AUTHS) + .setAccumuloUser("root") + .setAccumuloPassword("") + .setAccumuloInstance(INSTANCE) + .setRyaPrefix(RYA_TABLE_PREFIX) + .setUsePcj(true) + .setUseAccumuloFreetextIndex(true) + .setUseAccumuloTemporalIndex(true) + .build(); + } public static void testAddAndDelete(final SailRepositoryConnection conn) @@ -729,7 +728,7 @@ public class RyaDirectExample { throws RepositoryException, AccumuloException, AccumuloSecurityException, TableExistsException, PcjException, InferenceEngineException, NumberFormatException, - UnknownHostException, SailException { + UnknownHostException, SailException, TableNotFoundException { final Configuration config = new AccumuloRdfConfiguration(conf); config.set(ConfigUtils.USE_PCJ, "false"); @@ -785,6 +784,7 @@ public class RyaDirectExample { new PcjTables().createAndPopulatePcj(conn, accCon, tablename2, queryString2, new String[] { "e", "c", "l", "o" }, Optional.<PcjVarOrderFactory> absent()); + } catch (final RyaDAOException e) { throw new Error("While creating PCJ tables.",e); } finally { http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/be9ea9a3/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/MergeTool.java ---------------------------------------------------------------------- diff --git a/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/MergeTool.java b/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/MergeTool.java index 8f045ee..d031d20 100644 --- a/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/MergeTool.java +++ b/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/MergeTool.java @@ -145,14 +145,14 @@ public class MergeTool extends AbstractDualInstanceAccumuloMRTool { .put(MRUtils.AC_PWD_PROP, ImmutableList.of(ConfigUtils.CLOUDBASE_PASSWORD)) .put(MRUtils.AC_AUTH_PROP, ImmutableList.of(ConfigUtils.CLOUDBASE_AUTHS, RdfCloudTripleStoreConfiguration.CONF_QUERY_AUTH)) .put(MRUtils.AC_ZK_PROP, ImmutableList.of(ConfigUtils.CLOUDBASE_ZOOKEEPERS)) - .put(MRUtils.TABLE_PREFIX_PROPERTY, ImmutableList.of(ConfigUtils.CLOUDBASE_TBL_PREFIX, RdfCloudTripleStoreConfiguration.CONF_TBL_PREFIX)) + .put(MRUtils.TABLE_PREFIX_PROPERTY, ImmutableList.of(RdfCloudTripleStoreConfiguration.CONF_TBL_PREFIX)) .put(MRUtils.AC_MOCK_PROP + CHILD_SUFFIX, ImmutableList.of(ConfigUtils.USE_MOCK_INSTANCE + CHILD_SUFFIX)) .put(MRUtils.AC_INSTANCE_PROP + CHILD_SUFFIX, ImmutableList.of(ConfigUtils.CLOUDBASE_INSTANCE + CHILD_SUFFIX)) .put(MRUtils.AC_USERNAME_PROP + CHILD_SUFFIX, ImmutableList.of(ConfigUtils.CLOUDBASE_USER + CHILD_SUFFIX)) .put(MRUtils.AC_PWD_PROP + CHILD_SUFFIX, ImmutableList.of(ConfigUtils.CLOUDBASE_PASSWORD + CHILD_SUFFIX)) .put(MRUtils.AC_AUTH_PROP + CHILD_SUFFIX, ImmutableList.of(ConfigUtils.CLOUDBASE_AUTHS + CHILD_SUFFIX, RdfCloudTripleStoreConfiguration.CONF_QUERY_AUTH + CHILD_SUFFIX)) .put(MRUtils.AC_ZK_PROP + CHILD_SUFFIX, ImmutableList.of(ConfigUtils.CLOUDBASE_ZOOKEEPERS + CHILD_SUFFIX)) - .put(MRUtils.TABLE_PREFIX_PROPERTY + CHILD_SUFFIX, ImmutableList.of(ConfigUtils.CLOUDBASE_TBL_PREFIX + CHILD_SUFFIX, RdfCloudTripleStoreConfiguration.CONF_TBL_PREFIX + CHILD_SUFFIX)) + .put(MRUtils.TABLE_PREFIX_PROPERTY + CHILD_SUFFIX, ImmutableList.of(RdfCloudTripleStoreConfiguration.CONF_TBL_PREFIX + CHILD_SUFFIX)) .build(); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/be9ea9a3/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/CreatePcj.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/CreatePcj.java b/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/CreatePcj.java index d29191d..86f5b48 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/CreatePcj.java +++ b/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/CreatePcj.java @@ -210,8 +210,7 @@ public class CreatePcj { triplesBatch.clear(); } return queryId; - } - + } private static void writeBatch(final FluoClient fluo, final Set<RyaStatement> batch) { checkNotNull(fluo); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/be9ea9a3/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/ITBase.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/ITBase.java b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/ITBase.java index fa9a10e..6e696c8 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/ITBase.java +++ b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/ITBase.java @@ -90,6 +90,8 @@ import org.openrdf.sail.Sail; import com.google.common.io.Files; +import org.apache.rya.api.RdfCloudTripleStoreConfiguration; + /** * Integration tests that ensure the Fluo application processes PCJs results * correctly. @@ -376,11 +378,10 @@ public abstract class ITBase { conf.set(ConfigUtils.CLOUDBASE_PASSWORD, ACCUMULO_PASSWORD); conf.set(ConfigUtils.CLOUDBASE_INSTANCE, instanceName); conf.set(ConfigUtils.CLOUDBASE_ZOOKEEPERS, zookeepers); - conf.set(ConfigUtils.CLOUDBASE_AUTHS, ""); + conf.set(RdfCloudTripleStoreConfiguration.CONF_QUERY_AUTH, ""); // PCJ configuration information. conf.set(ConfigUtils.USE_PCJ, "true"); conf.set(ConfigUtils.USE_PCJ_UPDATER_INDEX, "true"); - conf.set(ConfigUtils.USE_PCJ_FLUO_UPDATER, "true"); conf.set(ConfigUtils.FLUO_APP_NAME, FLUO_APP_NAME); conf.set(ConfigUtils.PCJ_STORAGE_TYPE, PrecomputedJoinIndexerConfig.PrecomputedJoinStorageType.ACCUMULO.toString()); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/be9ea9a3/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/StreamingTestIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/StreamingTestIT.java b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/StreamingTestIT.java index 29ef8f7..092e8a9 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/StreamingTestIT.java +++ b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/StreamingTestIT.java @@ -25,6 +25,7 @@ import java.util.UUID; import org.apache.accumulo.core.security.Authorizations; import org.apache.log4j.Logger; import org.apache.rya.accumulo.AccumuloRdfConfiguration; +import org.apache.rya.api.RdfCloudTripleStoreConfiguration; import org.apache.rya.indexing.accumulo.ConfigUtils; import org.apache.rya.indexing.pcj.fluo.ITBase; import org.apache.rya.indexing.pcj.fluo.api.CreatePcj; @@ -69,7 +70,9 @@ public class StreamingTestIT extends ITBase { @Before public void init() throws Exception { AccumuloRdfConfiguration conf = makeConfig(instanceName, zookeepers); - conf.set(ConfigUtils.CLOUDBASE_AUTHS, "U"); + conf.set(RdfCloudTripleStoreConfiguration.CONF_QUERY_AUTH, "U"); + conf.set(RdfCloudTripleStoreConfiguration.CONF_CV, "U"); + accumuloConn.securityOperations().changeUserAuthorizations("root", new Authorizations("U")); sail = RyaSailFactory.getInstance(conf); repo = new SailRepository(sail); conn = repo.getConnection(); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/be9ea9a3/osgi/camel.rya/src/test/java/org/apache/rya/camel/cbsail/CbSailTest.java ---------------------------------------------------------------------- diff --git a/osgi/camel.rya/src/test/java/org/apache/rya/camel/cbsail/CbSailTest.java b/osgi/camel.rya/src/test/java/org/apache/rya/camel/cbsail/CbSailTest.java index b0037fd..4803bd4 100644 --- a/osgi/camel.rya/src/test/java/org/apache/rya/camel/cbsail/CbSailTest.java +++ b/osgi/camel.rya/src/test/java/org/apache/rya/camel/cbsail/CbSailTest.java @@ -155,7 +155,7 @@ public class CbSailTest extends CamelTestSupport { "}"; Map<String, Object> headers = new HashMap<String, Object>(); headers.put(CbSailComponent.SPARQL_QUERY_PROP, query); - headers.put(RdfCloudTripleStoreConfiguration.BINDING_AUTH, "auth1"); + headers.put(RdfCloudTripleStoreConfiguration.CONF_QUERY_AUTH, "auth1"); template.sendBodyAndHeaders(null, headers); assertMockEndpointsSatisfied();
