Fixes to the pom file.
Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/0e4ecb11 Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/0e4ecb11 Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/0e4ecb11 Branch: refs/heads/0.2-dev Commit: 0e4ecb119dfce984a83a39fb3d924ab3d3e225d8 Parents: 2c689d7 Author: Aaron McCurry <[email protected]> Authored: Thu Jan 10 12:59:12 2013 -0500 Committer: Aaron McCurry <[email protected]> Committed: Thu Jan 10 12:59:12 2013 -0500 ---------------------------------------------------------------------- src/blur-mapred/pom.xml | 18 - .../org/apache/blur/thrift/generated/Analyzer.java | 36 +- .../apache/blur/thrift/generated/AnalyzerType.java | 36 +- .../org/apache/blur/thrift/generated/Blur.java | 974 +++++++++------ .../blur/thrift/generated/ClassDefinition.java | 44 +- .../org/apache/blur/thrift/generated/Document.java | 36 +- .../apache/blur/thrift/generated/FieldSchema.java | 760 +++++++++++ .../apache/blur/thrift/generated/QueryArgs.java | 32 +- .../org/apache/blur/thrift/generated/ScoreDoc.java | 32 +- .../apache/blur/thrift/generated/ShardLayout.java | 32 +- .../org/apache/blur/thrift/generated/Sort.java | 36 +- .../blur/thrift/generated/TableDescriptor.java | 44 +- .../apache/blur/thrift/generated/TableSchema.java | 474 +++++++ .../apache/blur/thrift/generated/TopFieldDocs.java | 72 +- .../blur/thrift/generated/UpdatePackage.java | 36 +- .../org/apache/blur/thrift/generated/Analyzer.java | 36 +- .../apache/blur/thrift/generated/AnalyzerType.java | 36 +- .../org/apache/blur/thrift/generated/Blur.java | 974 +++++++++------ .../blur/thrift/generated/ClassDefinition.java | 44 +- .../org/apache/blur/thrift/generated/Document.java | 36 +- .../apache/blur/thrift/generated/FieldSchema.java | 760 +++++++++++ .../apache/blur/thrift/generated/QueryArgs.java | 32 +- .../org/apache/blur/thrift/generated/ScoreDoc.java | 32 +- .../apache/blur/thrift/generated/ShardLayout.java | 32 +- .../org/apache/blur/thrift/generated/Sort.java | 36 +- .../blur/thrift/generated/TableDescriptor.java | 44 +- .../apache/blur/thrift/generated/TableSchema.java | 474 +++++++ .../apache/blur/thrift/generated/TopFieldDocs.java | 72 +- .../blur/thrift/generated/UpdatePackage.java | 36 +- 29 files changed, 4048 insertions(+), 1258 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/0e4ecb11/src/blur-mapred/pom.xml ---------------------------------------------------------------------- diff --git a/src/blur-mapred/pom.xml b/src/blur-mapred/pom.xml index 43541c5..87d30fb 100644 --- a/src/blur-mapred/pom.xml +++ b/src/blur-mapred/pom.xml @@ -99,24 +99,6 @@ </execution> </executions> </plugin> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <descriptorRefs> - <descriptorRef>jar-with-dependencies</descriptorRef> - </descriptorRefs> - </configuration> - - <executions> - <execution> - <id>make-assembly</id> - <phase>package</phase> - <goals> - <goal>attached</goal> - </goals> - </execution> - </executions> - </plugin> </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/0e4ecb11/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Analyzer.java ---------------------------------------------------------------------- diff --git a/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Analyzer.java b/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Analyzer.java index ef6c001..c009344 100644 --- a/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Analyzer.java +++ b/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Analyzer.java @@ -376,14 +376,14 @@ public class Analyzer implements org.apache.thrift.TBase<Analyzer, Analyzer._Fie case 1: // ANALYZER_TYPES if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list46 = iprot.readListBegin(); - struct.analyzerTypes = new ArrayList<AnalyzerType>(_list46.size); - for (int _i47 = 0; _i47 < _list46.size; ++_i47) + org.apache.thrift.protocol.TList _list36 = iprot.readListBegin(); + struct.analyzerTypes = new ArrayList<AnalyzerType>(_list36.size); + for (int _i37 = 0; _i37 < _list36.size; ++_i37) { - AnalyzerType _elem48; // required - _elem48 = new AnalyzerType(); - _elem48.read(iprot); - struct.analyzerTypes.add(_elem48); + AnalyzerType _elem38; // required + _elem38 = new AnalyzerType(); + _elem38.read(iprot); + struct.analyzerTypes.add(_elem38); } iprot.readListEnd(); } @@ -411,9 +411,9 @@ public class Analyzer implements org.apache.thrift.TBase<Analyzer, Analyzer._Fie oprot.writeFieldBegin(ANALYZER_TYPES_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.analyzerTypes.size())); - for (AnalyzerType _iter49 : struct.analyzerTypes) + for (AnalyzerType _iter39 : struct.analyzerTypes) { - _iter49.write(oprot); + _iter39.write(oprot); } oprot.writeListEnd(); } @@ -444,9 +444,9 @@ public class Analyzer implements org.apache.thrift.TBase<Analyzer, Analyzer._Fie if (struct.isSetAnalyzerTypes()) { { oprot.writeI32(struct.analyzerTypes.size()); - for (AnalyzerType _iter50 : struct.analyzerTypes) + for (AnalyzerType _iter40 : struct.analyzerTypes) { - _iter50.write(oprot); + _iter40.write(oprot); } } } @@ -458,14 +458,14 @@ public class Analyzer implements org.apache.thrift.TBase<Analyzer, Analyzer._Fie BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { { - org.apache.thrift.protocol.TList _list51 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.analyzerTypes = new ArrayList<AnalyzerType>(_list51.size); - for (int _i52 = 0; _i52 < _list51.size; ++_i52) + org.apache.thrift.protocol.TList _list41 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.analyzerTypes = new ArrayList<AnalyzerType>(_list41.size); + for (int _i42 = 0; _i42 < _list41.size; ++_i42) { - AnalyzerType _elem53; // required - _elem53 = new AnalyzerType(); - _elem53.read(iprot); - struct.analyzerTypes.add(_elem53); + AnalyzerType _elem43; // required + _elem43 = new AnalyzerType(); + _elem43.read(iprot); + struct.analyzerTypes.add(_elem43); } } struct.setAnalyzerTypesIsSet(true); http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/0e4ecb11/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/AnalyzerType.java ---------------------------------------------------------------------- diff --git a/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/AnalyzerType.java b/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/AnalyzerType.java index ec59f04..58c36b3 100644 --- a/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/AnalyzerType.java +++ b/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/AnalyzerType.java @@ -583,14 +583,14 @@ public class AnalyzerType implements org.apache.thrift.TBase<AnalyzerType, Analy case 3: // ANALYZER_SUB_TYPES if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list38 = iprot.readListBegin(); - struct.analyzerSubTypes = new ArrayList<AnalyzerSubType>(_list38.size); - for (int _i39 = 0; _i39 < _list38.size; ++_i39) + org.apache.thrift.protocol.TList _list28 = iprot.readListBegin(); + struct.analyzerSubTypes = new ArrayList<AnalyzerSubType>(_list28.size); + for (int _i29 = 0; _i29 < _list28.size; ++_i29) { - AnalyzerSubType _elem40; // required - _elem40 = new AnalyzerSubType(); - _elem40.read(iprot); - struct.analyzerSubTypes.add(_elem40); + AnalyzerSubType _elem30; // required + _elem30 = new AnalyzerSubType(); + _elem30.read(iprot); + struct.analyzerSubTypes.add(_elem30); } iprot.readListEnd(); } @@ -628,9 +628,9 @@ public class AnalyzerType implements org.apache.thrift.TBase<AnalyzerType, Analy oprot.writeFieldBegin(ANALYZER_SUB_TYPES_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.analyzerSubTypes.size())); - for (AnalyzerSubType _iter41 : struct.analyzerSubTypes) + for (AnalyzerSubType _iter31 : struct.analyzerSubTypes) { - _iter41.write(oprot); + _iter31.write(oprot); } oprot.writeListEnd(); } @@ -673,9 +673,9 @@ public class AnalyzerType implements org.apache.thrift.TBase<AnalyzerType, Analy if (struct.isSetAnalyzerSubTypes()) { { oprot.writeI32(struct.analyzerSubTypes.size()); - for (AnalyzerSubType _iter42 : struct.analyzerSubTypes) + for (AnalyzerSubType _iter32 : struct.analyzerSubTypes) { - _iter42.write(oprot); + _iter32.write(oprot); } } } @@ -696,14 +696,14 @@ public class AnalyzerType implements org.apache.thrift.TBase<AnalyzerType, Analy } if (incoming.get(2)) { { - org.apache.thrift.protocol.TList _list43 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.analyzerSubTypes = new ArrayList<AnalyzerSubType>(_list43.size); - for (int _i44 = 0; _i44 < _list43.size; ++_i44) + org.apache.thrift.protocol.TList _list33 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.analyzerSubTypes = new ArrayList<AnalyzerSubType>(_list33.size); + for (int _i34 = 0; _i34 < _list33.size; ++_i34) { - AnalyzerSubType _elem45; // required - _elem45 = new AnalyzerSubType(); - _elem45.read(iprot); - struct.analyzerSubTypes.add(_elem45); + AnalyzerSubType _elem35; // required + _elem35 = new AnalyzerSubType(); + _elem35.read(iprot); + struct.analyzerSubTypes.add(_elem35); } } struct.setAnalyzerSubTypesIsSet(true);
