You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rya.apache.org by mi...@apache.org on 2016/12/15 21:26:08 UTC
incubator-rya git commit: BUG FIX: Fixing compile issue
Repository: incubator-rya
Updated Branches:
refs/heads/master 8fca552e1 -> 5e79264df
BUG FIX: Fixing compile issue
Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/5e79264d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/5e79264d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/5e79264d
Branch: refs/heads/master
Commit: 5e79264dfbdc890d6e67f6a20c2d46fc43146d7c
Parents: 8fca552
Author: Aaron Mihalik <mi...@alum.mit.edu>
Authored: Thu Dec 15 16:20:24 2016 -0500
Committer: Aaron Mihalik <mi...@alum.mit.edu>
Committed: Thu Dec 15 16:20:24 2016 -0500
----------------------------------------------------------------------
.../org/apache/rya/indexing/GeoRyaSailFactory.java | 17 +++--------------
1 file changed, 3 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/5e79264d/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/GeoRyaSailFactory.java
----------------------------------------------------------------------
diff --git a/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/GeoRyaSailFactory.java b/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/GeoRyaSailFactory.java
index 5d2c52d..89933df 100644
--- a/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/GeoRyaSailFactory.java
+++ b/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/GeoRyaSailFactory.java
@@ -26,6 +26,8 @@ import java.util.Objects;
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.Instance;
+import org.apache.accumulo.core.client.security.tokens.PasswordToken;
import org.apache.hadoop.conf.Configuration;
import org.openrdf.sail.Sail;
import org.openrdf.sail.SailException;
@@ -36,6 +38,7 @@ import com.mongodb.MongoClient;
import org.apache.rya.accumulo.AccumuloRdfConfiguration;
import org.apache.rya.accumulo.AccumuloRyaDAO;
+import org.apache.rya.accumulo.instance.AccumuloRyaInstanceDetailsRepository;
import org.apache.rya.api.RdfCloudTripleStoreConfiguration;
import org.apache.rya.api.instance.RyaDetailsRepository.RyaDetailsRepositoryException;
import org.apache.rya.api.instance.RyaDetailsToConfiguration;
@@ -144,18 +147,4 @@ public class GeoRyaSailFactory {
dao.init();
return dao;
}
-<<<<<<< HEAD:extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/GeoRyaSailFactory.java
-=======
-
- private static void updateAccumuloConfig(final AccumuloRdfConfiguration config, final String user, final String pswd, final String ryaInstance) throws AccumuloException, AccumuloSecurityException {
- try {
- final PasswordToken pswdToken = new PasswordToken(pswd);
- final Instance accInst = ConfigUtils.getInstance(config);
- final AccumuloRyaInstanceDetailsRepository ryaDetailsRepo = new AccumuloRyaInstanceDetailsRepository(accInst.getConnector(user, pswdToken), ryaInstance);
- RyaDetailsToConfiguration.addRyaDetailsToConfiguration(ryaDetailsRepo.getRyaInstanceDetails(), config);
- } catch(final RyaDetailsRepositoryException e) {
- LOG.info("Instance does not have a rya details collection, skipping.");
- }
- }
->>>>>>> RYA-161 Merge Tool with client:extras/indexing/src/main/java/mvm/rya/sail/config/RyaSailFactory.java
}
\ No newline at end of file