Have builds working w/ hadoop 1. there's a test compilation failure with hadoop 2, so use -Dmaven.test.skip=true when building against hadoop 2 for now
Project: http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/commit/0ef257a8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/tree/0ef257a8 Diff: http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/diff/0ef257a8 Branch: refs/heads/master Commit: 0ef257a8035e3a58b1e2a866cada073e7f4b6c22 Parents: f11759e e158590 Author: Bill Slacum <billsla...@koverse.com> Authored: Fri Feb 7 01:13:08 2014 -0500 Committer: Bill Slacum <billsla...@koverse.com> Committed: Fri Feb 7 01:13:08 2014 -0500 ---------------------------------------------------------------------- accumulo-wikisearch.iml | 14 +++++++ ingest/pom.xml | 40 ++++++++++++-------- pom.xml | 4 +- query-war/pom.xml | 4 +- query/pom.xml | 5 ++- .../wikisearch/iterator/AndIterator.java | 1 - .../wikisearch/logic/TestQueryLogic.java | 2 +- 7 files changed, 48 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/blob/0ef257a8/accumulo-wikisearch.iml ---------------------------------------------------------------------- diff --cc accumulo-wikisearch.iml index 0000000,0000000..8015fa7 new file mode 100644 --- /dev/null +++ b/accumulo-wikisearch.iml @@@ -1,0 -1,0 +1,14 @@@ ++<?xml version="1.0" encoding="UTF-8"?> ++<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> ++ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false"> ++ <output url="file://$MODULE_DIR$/target/classes" /> ++ <output-test url="file://$MODULE_DIR$/target/test-classes" /> ++ <exclude-output /> ++ <content url="file://$MODULE_DIR$"> ++ <excludeFolder url="file://$MODULE_DIR$/target" /> ++ </content> ++ <orderEntry type="inheritedJdk" /> ++ <orderEntry type="sourceFolder" forTests="false" /> ++ </component> ++</module> ++ http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/blob/0ef257a8/ingest/pom.xml ---------------------------------------------------------------------- diff --cc ingest/pom.xml index d15f057,31d7110..fdf08e9 --- a/ingest/pom.xml +++ b/ingest/pom.xml @@@ -1,57 -1,56 +1,59 @@@ -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<?xml version="1.0" encoding="UTF-8"?> - <!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at + <!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> - +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>accumulo-wikisearch</artifactId> <groupId>org.apache.accumulo</groupId> - <version>1.4.5-SNAPSHOT</version> - <relativePath>../</relativePath> + <artifactId>accumulo-wikisearch</artifactId> - <version>1.5.0-SNAPSHOT</version> ++ <version>1.5.0</version> </parent> + <artifactId>wikisearch-ingest</artifactId> <name>wikisearch-ingest</name> + <dependencies> <dependency> - <groupId>org.apache.zookeeper</groupId> - <artifactId>zookeeper</artifactId> + <groupId>com.google.collections</groupId> + <artifactId>google-collections</artifactId> </dependency> <dependency> - <groupId>org.apache.accumulo</groupId> - <artifactId>accumulo-core</artifactId> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-java</artifactId> </dependency> <dependency> - <groupId>org.apache.accumulo</groupId> - <artifactId>accumulo-start</artifactId> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> </dependency> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-core</artifactId> </dependency> <dependency> - <groupId>com.google.collections</groupId> - <artifactId>google-collections</artifactId> + <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> ++ <artifactId>hadoop-client</artifactId> </dependency> <dependency> <groupId>org.apache.lucene</groupId> @@@ -59,9 -58,36 +61,15 @@@ </dependency> <dependency> <groupId>org.apache.lucene</groupId> - <artifactId>lucene-analyzers</artifactId> - </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> <artifactId>lucene-wikipedia</artifactId> </dependency> + <dependency> - <groupId>com.google.protobuf</groupId> - <artifactId>protobuf-java</artifactId> - </dependency> - <dependency> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-server</artifactId> - </dependency> - <dependency> - <groupId>org.apache.accumulo</groupId> - <artifactId>cloudtrace</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.apache.thrift</groupId> - <artifactId>libthrift</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> ++ <groupId>junit</groupId> ++ <artifactId>junit</artifactId> ++ <scope>test</scope> + </dependency> </dependencies> + <build> <plugins> <plugin> http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/blob/0ef257a8/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index 6a4fd39,1ea9a2a..919b08b --- a/pom.xml +++ b/pom.xml @@@ -18,9 -18,10 +18,9 @@@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>accumulo-examples</artifactId> - <groupId>org.apache.accumulo</groupId> - <version>1.4.5-SNAPSHOT</version> - <relativePath>../</relativePath> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-examples</artifactId> - <version>1.4.3</version> ++ <version>1.5.0</version> </parent> <artifactId>accumulo-wikisearch</artifactId> <packaging>pom</packaging> @@@ -128,12 -42,18 +129,13 @@@ <snapshots> <enabled>false</enabled> </snapshots> - </repository> - <repository> <id>java.net</id> <name>java.net</name> - <layout>default</layout> <url>https://maven.java.net/content/groups/public</url> - <snapshots> - <enabled>false</enabled> - </snapshots> + <layout>default</layout> </repository> </repositories> + <build> <defaultGoal>package</defaultGoal> <plugins> http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/blob/0ef257a8/query-war/pom.xml ---------------------------------------------------------------------- diff --cc query-war/pom.xml index 56f260a,485d584..be6e807 --- a/query-war/pom.xml +++ b/query-war/pom.xml @@@ -18,10 -18,11 +18,11 @@@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>accumulo-wikisearch</artifactId> <groupId>org.apache.accumulo</groupId> - <version>1.4.5-SNAPSHOT</version> + <artifactId>accumulo-wikisearch</artifactId> - <version>1.5.0-SNAPSHOT</version> ++ <version>1.5.0</version> </parent> + <artifactId>wikisearch-query-war</artifactId> <packaging>war</packaging> <name>wikisearch-query-war</name> http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/blob/0ef257a8/query/pom.xml ---------------------------------------------------------------------- diff --cc query/pom.xml index 804a992,8c6e6d3..6900919 --- a/query/pom.xml +++ b/query/pom.xml @@@ -16,12 -16,13 +16,13 @@@ limitations under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>accumulo-wikisearch</artifactId> <groupId>org.apache.accumulo</groupId> - <version>1.4.5-SNAPSHOT</version> - <relativePath>../</relativePath> + <artifactId>accumulo-wikisearch</artifactId> - <version>1.5.0-SNAPSHOT</version> ++ <version>1.5.0</version> </parent> + <artifactId>wikisearch-query</artifactId> <packaging>ejb</packaging> <name>wikisearch-query</name> @@@ -68,23 -75,20 +69,23 @@@ <version>${project.version}</version> </dependency> <dependency> - <groupId>com.googlecode</groupId> - <artifactId>minlog</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-jexl</artifactId> </dependency> <dependency> - <groupId>com.google.protobuf</groupId> - <artifactId>protobuf-java</artifactId> + <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> ++ <artifactId>hadoop-client</artifactId> </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> + <groupId>javaee</groupId> + <artifactId>javaee-api</artifactId> + <version>5</version> + <scope>provided</scope> </dependency> <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/blob/0ef257a8/query/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/AndIterator.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/blob/0ef257a8/query/src/test/java/org/apache/accumulo/examples/wikisearch/logic/TestQueryLogic.java ---------------------------------------------------------------------- diff --cc query/src/test/java/org/apache/accumulo/examples/wikisearch/logic/TestQueryLogic.java index ebc909e,24e7379..ac8241e --- a/query/src/test/java/org/apache/accumulo/examples/wikisearch/logic/TestQueryLogic.java +++ b/query/src/test/java/org/apache/accumulo/examples/wikisearch/logic/TestQueryLogic.java @@@ -127,9 -126,8 +127,9 @@@ public class TestQueryLogic writerMap.put(new Text(table), c.createBatchWriter(table, 1000L, 1000L, 1)); } - TaskAttemptContext context = ContextFactory.createTaskAttemptContext(conf); + TaskAttemptID id = new TaskAttemptID(); + TaskAttemptContext context = new TaskAttemptContext(conf, id); - + RawLocalFileSystem fs = new RawLocalFileSystem(); fs.setConf(conf);
