Skip to content
Permalink
Browse files
Merge pull request #80 from mikewalch/rename-fixes
Updates that get webindex working after rename
  • Loading branch information
keith-turner committed Jul 1, 2016
2 parents 58df012 + 4871304 commit 40dfcceb0907bea886ad88e01d3a67c91be99c63
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 8 deletions.
@@ -2,11 +2,11 @@
---
[![Build Status][ti]][tl] [![Apache License][li]][ll]

Webindex is an example Fluo application that uses [Common Crawl][cc] web crawl data to index
links to web pages in multiple ways. It has a simple UI to view the resulting indexes. If
you are new to Fluo, you may want start with the [fluo-quickstart][qs] or [phrasecount][pc]
applications as the webindex application is more complicated. For more information on how
the webindex application works, view the [tables](docs/tables.md) and
Webindex is an example [Apache Fluo][fluo] application that uses [Common Crawl][cc] web crawl
data to index links to web pages in multiple ways. It has a simple UI to view the resulting
indexes. If you are new to Fluo, you may want start with the [fluo-quickstart][qs] or
[phrasecount][pc] applications as the webindex application is more complicated. For more
information on how the webindex application works, view the [tables](docs/tables.md) and
[code](docs/code-guide.md) documentation.

### Requirements
@@ -129,6 +129,7 @@ configuration by creating a `dropwizard.yml` in `conf/`.

cp conf/dropwizard.yml.example conf/dropwizard.yml

[fluo]: https://fluo.apache.org/
[qs]: https://github.com/fluo-io/fluo-quickstart
[pc]: https://github.com/fluo-io/phrasecount
[fluo-dev]: https://github.com/fluo-io/fluo-dev
@@ -45,9 +45,9 @@ $FLUO_CMD new $FLUO_APP

FLUO_APP_LIB=$FLUO_APP_HOME/lib
cp $WI_DATA_JAR $FLUO_APP_LIB
mvn dependency:get -Dartifact=io.fluo:fluo-recipes-core:1.0.0-beta-3-SNAPSHOT:jar -Ddest=$FLUO_APP_LIB
mvn dependency:get -Dartifact=io.fluo:fluo-recipes-kryo:1.0.0-beta-3-SNAPSHOT:jar -Ddest=$FLUO_APP_LIB
mvn dependency:get -Dartifact=io.fluo:fluo-recipes-accumulo:1.0.0-beta-3-SNAPSHOT:jar -Ddest=$FLUO_APP_LIB
mvn dependency:get -Dartifact=org.apache.fluo:fluo-recipes-core:1.0.0-beta-3-SNAPSHOT:jar -Ddest=$FLUO_APP_LIB
mvn dependency:get -Dartifact=org.apache.fluo:fluo-recipes-kryo:1.0.0-beta-3-SNAPSHOT:jar -Ddest=$FLUO_APP_LIB
mvn dependency:get -Dartifact=org.apache.fluo:fluo-recipes-accumulo:1.0.0-beta-3-SNAPSHOT:jar -Ddest=$FLUO_APP_LIB
# Add kryo and its dependencies
mvn dependency:get -Dartifact=com.esotericsoftware:kryo:3.0.3:jar -Ddest=$FLUO_APP_LIB
mvn dependency:get -Dartifact=com.esotericsoftware:minlog:1.3.0:jar -Ddest=$FLUO_APP_LIB
@@ -18,9 +18,13 @@
import java.io.FileReader;

import com.esotericsoftware.yamlbeans.YamlReader;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

public class DataConfig {

private static final Logger log = LoggerFactory.getLogger(DataConfig.class);

public static String CC_URL_PREFIX = "https://aws-publicdatasets.s3.amazonaws.com/";
public static final String WI_EXECUTOR_INSTANCES = "WI_EXECUTOR_INSTANCES";

@@ -72,8 +76,10 @@ public static DataConfig load() {
final String userPath = homePath + "/conf/data.yml";
final String defaultPath = homePath + "/conf/data.yml.example";
if ((new File(userPath).exists())) {
log.info("Using user config at {}", userPath);
return load(userPath);
} else {
log.info("Using default config at {}" + defaultPath);
return load(defaultPath);
}
}
@@ -59,6 +59,14 @@
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
<exclusion>
<groupId>com.sun.jersey</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>

0 comments on commit 40dfcce

Please sign in to comment.