Permalink
Browse files

ACCUMULO-285 merge to trunk, resolve all 1.4 -> trunk merge conflicts

git-svn-id: https://svn.apache.org/repos/asf/incubator/accumulo/trunk@1230608 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
1 parent 5aec1f8 commit a0aef75647200fd76d8ec33c82f9d33a720256d9 Eric C. Newton committed Jan 12, 2012
Showing with 596 additions and 556 deletions.
  1. +0 −65 contrib/accumulo_sample/README
  2. +0 −58 contrib/accumulo_sample/query/src/main/java/iterator/DefaultIteratorEnvironment.java
  3. +30 −3 pom.xml
  4. +8 −3 src/assemble/pom.xml
  5. +0 −10 src/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java
  6. +0 −4 src/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java
  7. +0 −2 src/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/MutationLogger.java
  8. +0 −2 src/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java
  9. +53 −22 src/examples/pom.xml
  10. +68 −0 src/examples/simple/pom.xml
  11. +1 −1 ...e/accumulo/examples → simple/src/main/java/org/apache/accumulo/examples/simple}/client/Flush.java
  12. +1 −1 ...amples → simple/src/main/java/org/apache/accumulo/examples/simple}/client/RandomBatchScanner.java
  13. +1 −1 ...xamples → simple/src/main/java/org/apache/accumulo/examples/simple}/client/RandomBatchWriter.java
  14. +1 −1 ...examples → simple/src/main/java/org/apache/accumulo/examples/simple}/client/ReadWriteExample.java
  15. +1 −1 ...lo/examples → simple/src/main/java/org/apache/accumulo/examples/simple}/client/RowOperations.java
  16. +1 −1 ...les → simple/src/main/java/org/apache/accumulo/examples/simple}/client/SequentialBatchWriter.java
  17. +1 −1 .../examples → simple/src/main/java/org/apache/accumulo/examples/simple}/combiner/StatsCombiner.java
  18. +1 −1 ... simple/src/main/java/org/apache/accumulo/examples/simple}/constraints/AlphaNumKeyConstraint.java
  19. +1 −1 ...ples → simple/src/main/java/org/apache/accumulo/examples/simple}/constraints/MaxMutationSize.java
  20. +1 −1 ...simple/src/main/java/org/apache/accumulo/examples/simple}/constraints/NumericValueConstraint.java
  21. +1 −1 ...umulo/examples → simple/src/main/java/org/apache/accumulo/examples/simple}/dirlist/FileCount.java
  22. +2 −2 ...accumulo/examples → simple/src/main/java/org/apache/accumulo/examples/simple}/dirlist/Ingest.java
  23. +1 −1 ...umulo/examples → simple/src/main/java/org/apache/accumulo/examples/simple}/dirlist/QueryUtil.java
  24. +2 −2 ...accumulo/examples → simple/src/main/java/org/apache/accumulo/examples/simple}/dirlist/Viewer.java
  25. +1 −1 .../examples → simple/src/main/java/org/apache/accumulo/examples/simple}/filedata/ChunkCombiner.java
  26. +1 −1 ...amples → simple/src/main/java/org/apache/accumulo/examples/simple}/filedata/ChunkInputFormat.java
  27. +1 −1 ...amples → simple/src/main/java/org/apache/accumulo/examples/simple}/filedata/ChunkInputStream.java
  28. +1 −1 ...examples → simple/src/main/java/org/apache/accumulo/examples/simple}/filedata/FileDataIngest.java
  29. +1 −1 .../examples → simple/src/main/java/org/apache/accumulo/examples/simple}/filedata/FileDataQuery.java
  30. +1 −1 ...cumulo/examples → simple/src/main/java/org/apache/accumulo/examples/simple}/filedata/KeyUtil.java
  31. +1 −1 ...ples → simple/src/main/java/org/apache/accumulo/examples/simple}/filedata/VisibilityCombiner.java
  32. +1 −1 ...→ simple/src/main/java/org/apache/accumulo/examples/simple}/helloworld/InsertWithBatchWriter.java
  33. +5 −3 ... simple/src/main/java/org/apache/accumulo/examples/simple}/helloworld/InsertWithOutputFormat.java
  34. +1 −1 ...ulo/examples → simple/src/main/java/org/apache/accumulo/examples/simple}/helloworld/ReadData.java
  35. +1 −1 ...mples → simple/src/main/java/org/apache/accumulo/examples/simple}/isolation/InterferenceTest.java
  36. +1 −1 .../examples → simple/src/main/java/org/apache/accumulo/examples/simple}/mapreduce/RegexExample.java
  37. +1 −1 ...umulo/examples → simple/src/main/java/org/apache/accumulo/examples/simple}/mapreduce/RowHash.java
  38. +1 −1 ...o/examples → simple/src/main/java/org/apache/accumulo/examples/simple}/mapreduce/TableToFile.java
  39. +1 −1 ...xamples → simple/src/main/java/org/apache/accumulo/examples/simple}/mapreduce/TeraSortIngest.java
  40. +1 −1 ...ulo/examples → simple/src/main/java/org/apache/accumulo/examples/simple}/mapreduce/WordCount.java
  41. +1 −1 ...→ simple/src/main/java/org/apache/accumulo/examples/simple}/mapreduce/bulk/BulkIngestExample.java
  42. +1 −1 ... → simple/src/main/java/org/apache/accumulo/examples/simple}/mapreduce/bulk/GenerateTestData.java
  43. +1 −1 ...amples → simple/src/main/java/org/apache/accumulo/examples/simple}/mapreduce/bulk/SetupTable.java
  44. +1 −1 ...ples → simple/src/main/java/org/apache/accumulo/examples/simple}/mapreduce/bulk/VerifyIngest.java
  45. +1 −1 ...o/examples → simple/src/main/java/org/apache/accumulo/examples/simple}/shard/ContinuousQuery.java
  46. +1 −1 ...he/accumulo/examples → simple/src/main/java/org/apache/accumulo/examples/simple}/shard/Index.java
  47. +1 −1 ...he/accumulo/examples → simple/src/main/java/org/apache/accumulo/examples/simple}/shard/Query.java
  48. +1 −1 .../accumulo/examples → simple/src/main/java/org/apache/accumulo/examples/simple}/shard/Reverse.java
  49. +4 −1 ...umulo/examples → simple/src/test/java/org/apache/accumulo/examples/simple}/dirlist/CountTest.java
  50. +3 −3 ...mples → simple/src/test/java/org/apache/accumulo/examples/simple}/filedata/ChunkCombinerTest.java
  51. +12 −8 ...es → simple/src/test/java/org/apache/accumulo/examples/simple}/filedata/ChunkInputFormatTest.java
  52. +3 −3 ...es → simple/src/test/java/org/apache/accumulo/examples/simple}/filedata/ChunkInputStreamTest.java
  53. +2 −2 ...lo/examples → simple/src/test/java/org/apache/accumulo/examples/simple}/filedata/KeyUtilTest.java
  54. +65 −0 src/examples/wikisearch/README
  55. +3 −3 {contrib/accumulo_sample → src/examples/wikisearch}/ingest/bin/ingest.sh
  56. 0 ...mulo_sample/ingest/conf/wikipedia.xml → src/examples/wikisearch/ingest/conf/wikipedia.xml.example
  57. +4 −3 {contrib/accumulo_sample → src/examples/wikisearch}/ingest/pom.xml
  58. 0 {contrib/accumulo_sample → src/examples/wikisearch}/ingest/src/assembly/dist.xml
  59. +3 −4 ...t/src/main/java/org/apache/accumulo/examples/wikisearch}/aggregator/GlobalIndexUidAggregator.java
  60. +2 −2 ...ingest/src/main/java/org/apache/accumulo/examples/wikisearch}/aggregator/TextIndexAggregator.java
  61. +4 −3 ...search/ingest/src/main/java/org/apache/accumulo/examples/wikisearch}/ingest/ArticleExtractor.java
  62. +1 −1 .../ingest/src/main/java/org/apache/accumulo/examples/wikisearch}/ingest/WikipediaConfiguration.java
  63. +9 −8 ...earch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch}/ingest/WikipediaIngester.java
  64. +2 −2 ...ch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch}/ingest/WikipediaInputFormat.java
  65. +5 −5 ...isearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch}/ingest/WikipediaMapper.java
  66. +1 −1 ...est/src/main/java/org/apache/accumulo/examples/wikisearch}/iterator/TotalAggregatingIterator.java
  67. +2 −2 ...t/src/main/java/org/apache/accumulo/examples/wikisearch}/normalizer/LcNoDiacriticsNormalizer.java
  68. +1 −1 ...arch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch}/normalizer/NoOpNormalizer.java
  69. +1 −1 ...kisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch}/normalizer/Normalizer.java
  70. +1 −1 ...ch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch}/normalizer/NumberNormalizer.java
  71. +32 −32 ...wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch}/protobuf/TermWeight.java
  72. +32 −32 ...amples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch}/protobuf/Uid.java
  73. +3 −3 ...ingest/src/main/java/org/apache/accumulo/examples/wikisearch}/reader/AggregatingRecordReader.java
  74. +1 −1 ...wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch}/reader/LfLineReader.java
  75. +1 −1 ...ch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch}/reader/LongLineRecordReader.java
  76. +1 −1 ...mples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch}/util/TextUtil.java
  77. 0 {contrib/accumulo_sample → src/examples/wikisearch}/ingest/src/main/protobuf/TermWeight.proto
  78. 0 {contrib/accumulo_sample → src/examples/wikisearch}/ingest/src/main/protobuf/Uid.proto
  79. 0 {contrib/accumulo_sample → src/examples/wikisearch}/ingest/src/main/protobuf/compile_protos.sh
  80. +7 −3 ...c/test/java/org/apache/accumulo/examples/wikisearch}/aggregator/GlobalIndexUidAggregatorTest.java
  81. +4 −3 ...st/src/test/java/org/apache/accumulo/examples/wikisearch}/aggregator/TextIndexAggregatorTest.java
  82. +1 −1 ...ngest/src/test/java/org/apache/accumulo/examples/wikisearch/ingest}/StandaloneStatusReporter.java
  83. +14 −15 ...rch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch}/ingest/WikipediaMapperTest.java
  84. +2 −1 ...ngest/src/test/java/org/apache/accumulo/examples/wikisearch}/normalizer/testNumberNormalizer.java
  85. +2 −1 ...st/src/test/java/org/apache/accumulo/examples/wikisearch}/reader/AggregatingRecordReaderTest.java
  86. 0 ...trib/accumulo_sample → src/examples/wikisearch}/ingest/src/test/resources/enwiki-20110901-001.xml
  87. +11 −33 {contrib/accumulo_sample → src/examples/wikisearch}/pom.xml
  88. +3 −4 {contrib/accumulo_sample → src/examples/wikisearch}/query-war/pom.xml
  89. +1 −1 {contrib/accumulo_sample → src/examples/wikisearch}/query-war/src/main/webapp/WEB-INF/jboss-web.xml
  90. 0 {contrib/accumulo_sample → src/examples/wikisearch}/query-war/src/main/webapp/WEB-INF/web.xml
  91. +1 −1 {contrib/accumulo_sample → src/examples/wikisearch}/query-war/src/main/webapp/style.xsl
  92. +3 −3 {contrib/accumulo_sample → src/examples/wikisearch}/query-war/src/main/webapp/ui.jsp
  93. 0 {contrib/accumulo_sample → src/examples/wikisearch}/query-war/src/test/resources/test.xml
  94. +5 −6 {contrib/accumulo_sample → src/examples/wikisearch}/query/pom.xml
  95. +6 −7 {contrib/accumulo_sample → src/examples/wikisearch}/query/src/assembly/dist.xml
  96. +1 −1 ...isearch/query/src/main/java/org/apache/accumulo/examples/wikisearch}/function/QueryFunctions.java
  97. +3 −3 ...y/src/main/java/org/apache/accumulo/examples/wikisearch}/iterator/AbstractEvaluatingIterator.java
  98. +1 −1 ...wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch}/iterator/AndIterator.java
  99. +8 −8 ...h/query/src/main/java/org/apache/accumulo/examples/wikisearch}/iterator/BooleanLogicIterator.java
  100. +2 −2 ...h/query/src/main/java/org/apache/accumulo/examples/wikisearch}/iterator/BooleanLogicTreeNode.java
  101. +3 −3 ...rch/query/src/main/java/org/apache/accumulo/examples/wikisearch}/iterator/EvaluatingIterator.java
  102. +3 −3 ...rch/query/src/main/java/org/apache/accumulo/examples/wikisearch}/iterator/FieldIndexIterator.java
  103. +1 −1 ...query/src/main/java/org/apache/accumulo/examples/wikisearch}/iterator/OptimizedQueryIterator.java
  104. +1 −1 .../wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch}/iterator/OrIterator.java
  105. +1 −1 ...arch/query/src/main/java/org/apache/accumulo/examples/wikisearch}/iterator/ReadAheadIterator.java
  106. +2 −2 ...y/src/main/java/org/apache/accumulo/examples/wikisearch}/iterator/UniqFieldNameValueIterator.java
  107. +1 −1 ...ples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch}/jexl/Arithmetic.java
  108. +18 −21 ...search/query/src/main/java/org/apache/accumulo/examples/wikisearch}/logic/AbstractQueryLogic.java
  109. +5 −6 ...s/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch}/logic/ContentLogic.java
  110. +10 −12 ...les/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch}/logic/QueryLogic.java
  111. +2 −2 ...s/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch}/parser/EventFields.java
  112. +3 −3 .../query/src/main/java/org/apache/accumulo/examples/wikisearch}/parser/FieldIndexQueryReWriter.java
  113. +1 −1 ...ch/query/src/main/java/org/apache/accumulo/examples/wikisearch}/parser/JexlOperatorConstants.java
  114. +5 −5 ...ikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch}/parser/QueryEvaluator.java
  115. +1 −1 ...s/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch}/parser/QueryParser.java
  116. +6 −8 ...kisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch}/parser/RangeCalculator.java
  117. +7 −7 ...s/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch}/parser/TreeBuilder.java
  118. +2 −2 ...ples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch}/parser/TreeNode.java
  119. +3 −2 ...xamples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch}/query/IQuery.java
  120. +5 −5 ...examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch}/query/Query.java
  121. +1 −1 ...ples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch}/sample/Document.java
  122. +1 −1 ...xamples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch}/sample/Field.java
  123. +1 −1 ...mples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch}/sample/Results.java
  124. +1 −1 ...s/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch}/util/BaseKeyParser.java
  125. +1 −1 ...search/query/src/main/java/org/apache/accumulo/examples/wikisearch}/util/FieldIndexKeyParser.java
  126. +1 −1 ...mples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch}/util/KeyParser.java
  127. 0 {contrib/accumulo_sample → src/examples/wikisearch}/query/src/main/resources/META-INF/MANIFEST.MF
  128. 0 ...A-INF/ejb-jar.xml → src/examples/wikisearch/query/src/main/resources/META-INF/ejb-jar.xml.example
  129. +1 −1 .../query/src/test/java/org/apache/accumulo/examples/wikisearch/logic}/StandaloneStatusReporter.java
  130. +31 −33 ...wikisearch/query/src/test/java/org/apache/accumulo/examples/wikisearch}/logic/TestQueryLogic.java
  131. 0 {contrib/accumulo_sample → src/examples/wikisearch}/query/src/test/resources/enwiki-20110901-001.xml
  132. +2 −0 src/trace/thrift.sh
@@ -1,65 +0,0 @@
-
- This project contains a sample application for ingesting and querying wikipedia data.
-
-
- Ingest
- ------
-
- Prerequisites
- -------------
- 1. ACCUMULO, Hadoop, and ZooKeeper must be installed and running
- 2. ACCUMULO_HOME and ZOOKEEPER_HOME are defined in the environment
- 3. One or more wikipedia dump files (http://dumps.wikimedia.org/backup-index.html) placed in an HDFS directory.
- You will want to grab the files with the link name of pages-articles.xml.bz2
-
-
- INSTRUCTIONS
- ------------
- 1. Build the ingest assembly by running 'mvn assembly:assembly' in the ingest directory.
- 2. Untar the distribution in some directory.
- 3. Modify the conf/wikipedia.xml file to specify ACCUMULO information.
- 4. Copy the lib/accumulo-sample*.jar and lib/protobuf*.jar to $ACCUMULO_HOME/lib/ext
- 5. Then run bin/ingest.sh with one argument (the name of the directory in HDFS where the wikipedia XML files reside)
- and this will kick off a MapReduce job to ingest the data into ACCUMULO.
-
- Query
- -----
-
- Prerequisites
- -------------
- 1. The query software was tested using JBoss AS 6. Install this unless you feel like messing with the installation.
-
- NOTE: Ran into a bug (https://issues.jboss.org/browse/RESTEASY-531) that did not allow an EJB3.1 war file. I was able
- to workaround this by separating the RESTEasy servlet from the EJBs by creating an EJB jar and a WAR file.
-
- INSTRUCTIONS
- -------------
- 1. Modify the query/src/main/resources/META-INF/ejb-jar.xml file with the same information that you put into the wikipedia.xml
- file from the Ingest step above.
- 2. Build the query distribution by running 'mvn assembly:assembly' in the query directory.
- 3. Untar the resulting file from the $JBOSS_HOME/server/default directory. This will place the dependent jars in the lib
- directory and the EJB jar into the deploy directory.
- 4. Next, run 'mvn clean package' in the query-war directory and copy the war to $JBOSS_HOME/server/default/deploy.
- 5. Start JBoss ($JBOSS_HOME/bin/run.sh)
- 6. Login to Accumulo and give the user permissions for the wikis that you loaded, for example:
- setauths -u <user> -s all,enwiki,eswiki,frwiki,fawiki
- 7. Copy the following jars to the $ACCUMULO_HOME/lib/ext directory from the $JBOSS_HOME/server/default/lib directory:
-
- commons-lang*.jar
- kryo*.jar
- minlog*.jar
- reflectasm*.jar
- asm*.jar
- commons-jexl*.jar
- google-collections*.jar
-
- 8. Copy the $JBOSS_HOME/server/default/deploy/accumulo-sample-query*.jar to $ACCUMULO_HOME/lib/ext.
-
-
- 9. At this point you should be able to open a browser and view the page: http://localhost:8080/accumulo-sample/ui/ui.jsp.
- You can issue the queries using this user interface or via the following REST urls: <host>/accumulo-sample/rest/Query/xml,
- <host>/accumulo-sample/rest/Query/html, <host>/accumulo-sample/rest/Query/yaml, or <host>/accumulo-sample/rest/Query/json.
- There are two parameters to the REST service, query and auths. The query parameter is the same string that you would type
- into the search box at ui.jsp, and the auths parameter is a comma-separated list of wikis that you want to search (i.e.
- enwiki,frwiki,dewiki, etc. Or you can use all)
-
@@ -1,58 +0,0 @@
-/*
- * 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
- *
- * 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.
- */
-package iterator;
-
-import java.io.IOException;
-
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.FileSystem;
-
-import org.apache.accumulo.core.conf.AccumuloConfiguration;
-import org.apache.accumulo.core.data.Key;
-import org.apache.accumulo.core.data.Value;
-import org.apache.accumulo.core.file.map.MyMapFile;
-import org.apache.accumulo.core.file.map.MyMapFile.Reader;
-import org.apache.accumulo.core.iterators.IteratorEnvironment;
-import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope;
-import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
-import org.apache.accumulo.core.util.CachedConfiguration;
-
-public class DefaultIteratorEnvironment implements IteratorEnvironment {
-
- public Reader reserveMapFileReader(String mapFileName) throws IOException {
- Configuration conf = CachedConfiguration.getInstance();
- FileSystem fs = FileSystem.get(conf);
- return new MyMapFile.Reader(fs, mapFileName, conf);
- }
-
- public AccumuloConfiguration getConfig() {
- return AccumuloConfiguration.getDefaultConfiguration();
- }
-
- public IteratorScope getIteratorScope() {
- throw new UnsupportedOperationException();
- }
-
- public boolean isFullMajorCompaction() {
- throw new UnsupportedOperationException();
- }
-
- public void registerSideChannel(SortedKeyValueIterator<Key,Value> iter) {
- throw new UnsupportedOperationException();
- }
-
-}
View
33 pom.xml
@@ -168,6 +168,27 @@
</environmentVariables>
</configuration>
</plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <inherited>false</inherited>
+ <configuration>
+ <executable>bash</executable>
+ <arguments>
+ <argument>docs/src/user_manual/build.sh</argument>
+ </arguments>
+ </configuration>
+ <executions>
+ <execution>
+ <id>user-manual</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
@@ -199,7 +220,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore />
+ <ignore/>
</action>
</pluginExecution>
<pluginExecution>
@@ -225,7 +246,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore />
+ <ignore/>
</action>
</pluginExecution>
<pluginExecution>
@@ -410,7 +431,13 @@
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-examples</artifactId>
+ <artifactId>examples-simple</artifactId>
+ <version>1.5.0-incubating-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>wikisearch-query-war</artifactId>
+ <type>war</type>
<version>1.5.0-incubating-SNAPSHOT</version>
</dependency>
View
@@ -42,7 +42,12 @@
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-examples</artifactId>
+ <artifactId>examples-simple</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>wikisearch-query-war</artifactId>
+ <type>war</type>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
@@ -87,7 +92,7 @@
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
- <finalName>${parent.artifactId}-${version}</finalName>
+ <finalName>${project.parent.artifactId}-${project.version}</finalName>
<descriptors>
<descriptor>src/assemble/dist.xml</descriptor>
</descriptors>
@@ -238,4 +243,4 @@
</build>
</profile>
</profiles>
-</project>
+</project>
@@ -6262,8 +6262,6 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept
private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
try {
- // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
- __isset_bit_vector = new BitSet(1);
read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
} catch (org.apache.thrift.TException te) {
throw new java.io.IOException(te);
@@ -7821,8 +7819,6 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept
private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
try {
- // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
- __isset_bit_vector = new BitSet(1);
read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
} catch (org.apache.thrift.TException te) {
throw new java.io.IOException(te);
@@ -14037,8 +14033,6 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept
private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
try {
- // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
- __isset_bit_vector = new BitSet(1);
read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
} catch (org.apache.thrift.TException te) {
throw new java.io.IOException(te);
@@ -15168,8 +15162,6 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept
private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
try {
- // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
- __isset_bit_vector = new BitSet(1);
read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
} catch (org.apache.thrift.TException te) {
throw new java.io.IOException(te);
@@ -21131,8 +21123,6 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept
private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
try {
- // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
- __isset_bit_vector = new BitSet(1);
read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
} catch (org.apache.thrift.TException te) {
throw new java.io.IOException(te);
@@ -2990,8 +2990,6 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept
private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
try {
- // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
- __isset_bit_vector = new BitSet(1);
read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
} catch (org.apache.thrift.TException te) {
throw new java.io.IOException(te);
@@ -13071,8 +13069,6 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept
private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
try {
- // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
- __isset_bit_vector = new BitSet(1);
read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
} catch (org.apache.thrift.TException te) {
throw new java.io.IOException(te);
@@ -9319,8 +9319,6 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept
private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
try {
- // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
- __isset_bit_vector = new BitSet(1);
read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
} catch (org.apache.thrift.TException te) {
throw new java.io.IOException(te);
@@ -9884,8 +9884,6 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept
private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
try {
- // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
- __isset_bit_vector = new BitSet(1);
read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
} catch (org.apache.thrift.TException te) {
throw new java.io.IOException(te);
View
@@ -1,43 +1,74 @@
<?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
+ 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
+ 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.
-->
-<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">
-
+<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>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo</artifactId>
- <version>1.5.0-incubating-SNAPSHOT</version>
- <relativePath>../../</relativePath>
+ <artifactId>accumulo</artifactId>
+ <groupId>org.apache.accumulo</groupId>
+ <version>1.5.0-incubating-SNAPSHOT</version>
+ <relativePath>../../</relativePath>
</parent>
-
- <modelVersion>4.0.0</modelVersion>
<artifactId>accumulo-examples</artifactId>
+ <packaging>pom</packaging>
<name>accumulo-examples</name>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-core</artifactId>
- </dependency>
- </dependencies>
+ <modules>
+ <module>simple</module>
+ <module>wikisearch</module>
+ </modules>
+
+ <repositories>
+ <repository>
+ <id>central</id>
+ <name>Maven Repository Switchboard</name>
+ <layout>default</layout>
+ <url>http://repo1.maven.org/maven2</url>
+ <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>
+ </repository>
+ </repositories>
+
+ <build>
+ <defaultGoal>package</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce-mvn</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Oops, something went wrong.

0 comments on commit a0aef75

Please sign in to comment.