JHUAPL/AccumuloGraph
1
0
Fork 0
mirror of https://github.com/JHUAPL/AccumuloGraph.git synced 2026-01-09 20:57:55 -05:00
Code Issues Packages Projects Releases 4 Wiki Activity

Updated the pom to have hadoop jars provided.

Browse Source 
Fixed configuration for rexster use
This commit is contained in:
Ryan Webb
2014-11-10 09:01:58 -05:00
parent de42c76fa5
commit dd98652d92
2 changed files with 15 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
pom.xml
View File

@@ -67,40 +67,29 @@
<artifactId>commons-collections</artifactId>
<version>3.2.1</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
<version>2.2.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.tinkerpop.rexster</groupId>
<artifactId>rexster-server</artifactId>
<version>2.6.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.tinkerpop.blueprints</groupId>
<artifactId>blueprints-test</artifactId>
<version>2.6.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
<version>2.2.0</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-minicluster</artifactId>
<version>2.2.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>jasper-runtime</artifactId>
<groupId>tomcat</groupId>
</exclusion>
<exclusion>
<artifactId>servlet-api</artifactId>
<groupId>javax.servlet</groupId>
</exclusion>
<exclusion>
<artifactId>javax.servlet-api</artifactId>
<groupId>javax.servlet</groupId>
</exclusion>
<exclusion>
<artifactId>jsp-api</artifactId>
<groupId>javax.servlet.jsp</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -114,17 +103,6 @@
<version>3.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.tinkerpop.rexster</groupId>
<artifactId>rexster-server</artifactId>
<version>2.6.0</version>
<exclusions>
<exclusion>
<artifactId>javax.servlet-api</artifactId>
<groupId>javax.servlet</groupId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
<distributionManagement>

6
src/main/java/edu/jhuapl/tinkerpop/AccumuloGraphConfiguration.java
View File

@@ -244,12 +244,12 @@ public class AccumuloGraphConfiguration implements Serializable {
}
public AccumuloGraphConfiguration(Configuration config) {
conf = new PropertiesConfiguration();
this();
Iterator<String> keys = config.getKeys();
while (keys.hasNext()) {
String key = keys.next();
conf.addProperty(key.replace("..", "."), config.getProperty(key));
conf.setProperty(key.replace("..", "."), config.getProperty(key));
}
}