incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [51/51] [partial] git commit: Restructuring the distribution projects to allow for seperate hadoop2 and hadoop1 binaries.
Date Tue, 29 Apr 2014 21:52:09 GMT
Restructuring the distribution projects to allow for seperate hadoop2 and hadoop1 binaries.


Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/7395b9cb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/7395b9cb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/7395b9cb

Branch: refs/heads/hadoop2_split
Commit: 7395b9cbea8404bc9db9a0d58676b5bcbd176721
Parents: 2f17851
Author: Aaron McCurry <amccurry@gmail.com>
Authored: Tue Apr 29 17:50:39 2014 -0400
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Tue Apr 29 17:50:39 2014 -0400

----------------------------------------------------------------------
 blur-core/pom.xml                               |     4 +-
 blur-gui/pom.xml                                |     4 +-
 blur-mapred/pom.xml                             |     4 +-
 blur-shell/pom.xml                              |    70 +-
 blur-store/pom.xml                              |     9 +-
 distribution-hadoop1/pom.xml                    |    65 +
 distribution-hadoop1/src/assemble/bin.xml       |   140 +
 .../src/main/resources/LICENSE-bin.txt          |   790 +
 .../src/main/resources/NOTICE-bin.base.txt      |     8 +
 .../src/main/resources/NOTICE-bin.txt           |   132 +
 .../src/main/resources/license-notes.txt        |    17 +
 .../resources/notices/commons-el-1.0.jar.NOTICE |     0
 .../notices/commons-httpclient-3.0.1.jar.NOTICE |     0
 ...concurrentlinkedhashmap-lru-1.3.2.jar.NOTICE |     7 +
 .../main/resources/notices/generate-notice.sh   |    27 +
 .../resources/notices/guava-14.0.jar.NOTICE     |     0
 .../jackson-annotations-2.1.1.jar.NOTICE        |     0
 .../notices/jackson-core-2.1.1.jar.NOTICE       |     0
 .../notices/jackson-databind-2.1.1.jar.NOTICE   |     0
 .../notices/jakarta-regexp-1.4.jar.NOTICE       |     0
 .../notices/jasper-compiler-5.5.12.jar.NOTICE   |    18 +
 .../notices/jasper-runtime-5.5.12.jar.NOTICE    |    18 +
 .../resources/notices/jets3t-0.6.1.jar.NOTICE   |    18 +
 .../resources/notices/jetty-6.1.26.jar.NOTICE   |    36 +
 .../notices/jetty-util-6.1.26.jar.NOTICE        |    36 +
 .../notices/metrics-core-2.2.0.jar.NOTICE       |    11 +
 .../notices/metrics-ganglia-2.2.0.jar.NOTICE    |    11 +
 .../notices/metrics-graphite-2.2.0.jar.NOTICE   |    11 +
 .../notices/metrics-servlet-2.2.0.jar.NOTICE    |    11 +
 .../main/resources/notices/oro-2.0.8.jar.NOTICE |     0
 .../resources/notices/spatial4j-0.3.jar.NOTICE  |     0
 .../notices/zookeeper-3.4.5.jar.NOTICE          |     5 +
 distribution-hadoop1/src/main/scripts/bin/blur  |    37 +
 .../src/main/scripts/bin/blur-config.sh         |    88 +
 .../src/main/scripts/bin/controllers.sh         |    34 +
 .../src/main/scripts/bin/shards.sh              |    34 +
 .../src/main/scripts/bin/start-all.sh           |    27 +
 .../main/scripts/bin/start-controller-server.sh |    41 +
 .../src/main/scripts/bin/start-controllers.sh   |    24 +
 .../src/main/scripts/bin/start-shard-server.sh  |    43 +
 .../src/main/scripts/bin/start-shards.sh        |    25 +
 .../main/scripts/bin/start-zookeeper-server.sh  |    39 +
 .../src/main/scripts/bin/start-zookeepers.sh    |    25 +
 .../src/main/scripts/bin/stop-all.sh            |    27 +
 .../main/scripts/bin/stop-controller-server.sh  |    38 +
 .../src/main/scripts/bin/stop-controllers.sh    |    24 +
 .../src/main/scripts/bin/stop-shard-server.sh   |    38 +
 .../src/main/scripts/bin/stop-shards.sh         |    27 +
 .../main/scripts/bin/stop-zookeeper-server.sh   |    37 +
 .../src/main/scripts/bin/stop-zookeepers.sh     |    24 +
 .../src/main/scripts/bin/zookeepers.sh          |    34 +
 .../src/main/scripts/interface/Blur.thrift      |  1246 +
 .../src/main/scripts/interface/apache.header    |    19 +
 .../main/scripts/interface/gen-html/Blur.html   |   960 +
 .../main/scripts/interface/gen-html/index.html  |    93 +
 .../main/scripts/interface/gen-html/style.css   |   184 +
 .../org/apache/blur/thrift/generated/Blur.java  | 40418 +++++++++++++++++
 .../blur/thrift/generated/BlurException.java    |   649 +
 .../apache/blur/thrift/generated/BlurQuery.java |  1979 +
 .../blur/thrift/generated/BlurQueryStatus.java  |  1188 +
 .../blur/thrift/generated/BlurResult.java       |   813 +
 .../blur/thrift/generated/BlurResults.java      |  1208 +
 .../apache/blur/thrift/generated/Column.java    |   532 +
 .../blur/thrift/generated/ColumnDefinition.java |  1187 +
 .../apache/blur/thrift/generated/CpuTime.java   |   524 +
 .../apache/blur/thrift/generated/ErrorType.java |    83 +
 .../org/apache/blur/thrift/generated/Facet.java |   552 +
 .../thrift/generated/FetchRecordResult.java     |   537 +
 .../blur/thrift/generated/FetchResult.java      |   871 +
 .../blur/thrift/generated/FetchRowResult.java   |   859 +
 .../blur/thrift/generated/HighlightOptions.java |   671 +
 .../org/apache/blur/thrift/generated/Level.java |    85 +
 .../apache/blur/thrift/generated/Metric.java    |   945 +
 .../org/apache/blur/thrift/generated/Query.java |   896 +
 .../blur/thrift/generated/QueryState.java       |    78 +
 .../apache/blur/thrift/generated/Record.java    |   698 +
 .../blur/thrift/generated/RecordMutation.java   |   548 +
 .../thrift/generated/RecordMutationType.java    |    79 +
 .../org/apache/blur/thrift/generated/Row.java   |   590 +
 .../blur/thrift/generated/RowMutation.java      |   821 +
 .../blur/thrift/generated/RowMutationType.java  |    75 +
 .../apache/blur/thrift/generated/Schema.java    |   648 +
 .../apache/blur/thrift/generated/ScoreType.java |    79 +
 .../apache/blur/thrift/generated/Selector.java  |  1654 +
 .../blur/thrift/generated/ShardState.java       |    87 +
 .../apache/blur/thrift/generated/SortField.java |   603 +
 .../blur/thrift/generated/SortFieldResult.java  |   677 +
 .../apache/blur/thrift/generated/Status.java    |    70 +
 .../blur/thrift/generated/TableDescriptor.java  |  2212 +
 .../blur/thrift/generated/TableStats.java       |   742 +
 .../org/apache/blur/thrift/generated/User.java  |   596 +
 .../src/main/scripts/interface/gen-js/Blur.js   |  7342 +++
 .../main/scripts/interface/gen-js/Blur_types.js |  3641 ++
 .../scripts/interface/gen-perl/Blur/Blur.pm     | 10090 ++++
 .../interface/gen-perl/Blur/Constants.pm        |    13 +
 .../scripts/interface/gen-perl/Blur/Types.pm    |  3806 ++
 .../src/main/scripts/interface/gen-rb/blur.rb   |  2713 ++
 .../scripts/interface/gen-rb/blur_constants.rb  |    11 +
 .../main/scripts/interface/gen-rb/blur_types.rb |   934 +
 .../src/main/scripts/interface/genAndReplace.sh |    41 +
 .../src/main/scripts/logs/.empty                |     0
 .../src/main/scripts/pids/.empty                |     0
 distribution-hadoop2/pom.xml                    |    66 +
 distribution-hadoop2/src/assemble/bin.xml       |   141 +
 .../src/main/resources/LICENSE-bin.txt          |   790 +
 .../src/main/resources/NOTICE-bin.base.txt      |     8 +
 .../src/main/resources/NOTICE-bin.txt           |   132 +
 .../src/main/resources/license-notes.txt        |    17 +
 .../resources/notices/commons-el-1.0.jar.NOTICE |     0
 .../notices/commons-httpclient-3.0.1.jar.NOTICE |     0
 ...concurrentlinkedhashmap-lru-1.3.2.jar.NOTICE |     7 +
 .../main/resources/notices/generate-notice.sh   |    27 +
 .../resources/notices/guava-14.0.jar.NOTICE     |     0
 .../jackson-annotations-2.1.1.jar.NOTICE        |     0
 .../notices/jackson-core-2.1.1.jar.NOTICE       |     0
 .../notices/jackson-databind-2.1.1.jar.NOTICE   |     0
 .../notices/jakarta-regexp-1.4.jar.NOTICE       |     0
 .../notices/jasper-compiler-5.5.12.jar.NOTICE   |    18 +
 .../notices/jasper-runtime-5.5.12.jar.NOTICE    |    18 +
 .../resources/notices/jets3t-0.6.1.jar.NOTICE   |    18 +
 .../resources/notices/jetty-6.1.26.jar.NOTICE   |    36 +
 .../notices/jetty-util-6.1.26.jar.NOTICE        |    36 +
 .../notices/metrics-core-2.2.0.jar.NOTICE       |    11 +
 .../notices/metrics-ganglia-2.2.0.jar.NOTICE    |    11 +
 .../notices/metrics-graphite-2.2.0.jar.NOTICE   |    11 +
 .../notices/metrics-servlet-2.2.0.jar.NOTICE    |    11 +
 .../main/resources/notices/oro-2.0.8.jar.NOTICE |     0
 .../resources/notices/spatial4j-0.3.jar.NOTICE  |     0
 .../notices/zookeeper-3.4.5.jar.NOTICE          |     5 +
 distribution-hadoop2/src/main/scripts/bin/blur  |    37 +
 .../src/main/scripts/bin/blur-config.sh         |    88 +
 .../src/main/scripts/bin/controllers.sh         |    34 +
 .../src/main/scripts/bin/shards.sh              |    34 +
 .../src/main/scripts/bin/start-all.sh           |    27 +
 .../main/scripts/bin/start-controller-server.sh |    41 +
 .../src/main/scripts/bin/start-controllers.sh   |    24 +
 .../src/main/scripts/bin/start-shard-server.sh  |    43 +
 .../src/main/scripts/bin/start-shards.sh        |    25 +
 .../main/scripts/bin/start-zookeeper-server.sh  |    39 +
 .../src/main/scripts/bin/start-zookeepers.sh    |    25 +
 .../src/main/scripts/bin/stop-all.sh            |    27 +
 .../main/scripts/bin/stop-controller-server.sh  |    38 +
 .../src/main/scripts/bin/stop-controllers.sh    |    24 +
 .../src/main/scripts/bin/stop-shard-server.sh   |    38 +
 .../src/main/scripts/bin/stop-shards.sh         |    27 +
 .../main/scripts/bin/stop-zookeeper-server.sh   |    37 +
 .../src/main/scripts/bin/stop-zookeepers.sh     |    24 +
 .../src/main/scripts/bin/zookeepers.sh          |    34 +
 .../src/main/scripts/interface/Blur.thrift      |  1246 +
 .../src/main/scripts/interface/apache.header    |    19 +
 .../main/scripts/interface/gen-html/Blur.html   |   960 +
 .../main/scripts/interface/gen-html/index.html  |    93 +
 .../main/scripts/interface/gen-html/style.css   |   184 +
 .../org/apache/blur/thrift/generated/Blur.java  | 40418 +++++++++++++++++
 .../blur/thrift/generated/BlurException.java    |   649 +
 .../apache/blur/thrift/generated/BlurQuery.java |  1979 +
 .../blur/thrift/generated/BlurQueryStatus.java  |  1188 +
 .../blur/thrift/generated/BlurResult.java       |   813 +
 .../blur/thrift/generated/BlurResults.java      |  1208 +
 .../apache/blur/thrift/generated/Column.java    |   532 +
 .../blur/thrift/generated/ColumnDefinition.java |  1187 +
 .../apache/blur/thrift/generated/CpuTime.java   |   524 +
 .../apache/blur/thrift/generated/ErrorType.java |    83 +
 .../org/apache/blur/thrift/generated/Facet.java |   552 +
 .../thrift/generated/FetchRecordResult.java     |   537 +
 .../blur/thrift/generated/FetchResult.java      |   871 +
 .../blur/thrift/generated/FetchRowResult.java   |   859 +
 .../blur/thrift/generated/HighlightOptions.java |   671 +
 .../org/apache/blur/thrift/generated/Level.java |    85 +
 .../apache/blur/thrift/generated/Metric.java    |   945 +
 .../org/apache/blur/thrift/generated/Query.java |   896 +
 .../blur/thrift/generated/QueryState.java       |    78 +
 .../apache/blur/thrift/generated/Record.java    |   698 +
 .../blur/thrift/generated/RecordMutation.java   |   548 +
 .../thrift/generated/RecordMutationType.java    |    79 +
 .../org/apache/blur/thrift/generated/Row.java   |   590 +
 .../blur/thrift/generated/RowMutation.java      |   821 +
 .../blur/thrift/generated/RowMutationType.java  |    75 +
 .../apache/blur/thrift/generated/Schema.java    |   648 +
 .../apache/blur/thrift/generated/ScoreType.java |    79 +
 .../apache/blur/thrift/generated/Selector.java  |  1654 +
 .../blur/thrift/generated/ShardState.java       |    87 +
 .../apache/blur/thrift/generated/SortField.java |   603 +
 .../blur/thrift/generated/SortFieldResult.java  |   677 +
 .../apache/blur/thrift/generated/Status.java    |    70 +
 .../blur/thrift/generated/TableDescriptor.java  |  2212 +
 .../blur/thrift/generated/TableStats.java       |   742 +
 .../org/apache/blur/thrift/generated/User.java  |   596 +
 .../src/main/scripts/interface/gen-js/Blur.js   |  7342 +++
 .../main/scripts/interface/gen-js/Blur_types.js |  3641 ++
 .../scripts/interface/gen-perl/Blur/Blur.pm     | 10090 ++++
 .../interface/gen-perl/Blur/Constants.pm        |    13 +
 .../scripts/interface/gen-perl/Blur/Types.pm    |  3806 ++
 .../src/main/scripts/interface/gen-rb/blur.rb   |  2713 ++
 .../scripts/interface/gen-rb/blur_constants.rb  |    11 +
 .../main/scripts/interface/gen-rb/blur_types.rb |   934 +
 .../src/main/scripts/interface/genAndReplace.sh |    41 +
 .../src/main/scripts/logs/.empty                |     0
 .../src/main/scripts/pids/.empty                |     0
 distribution-src/pom.xml                        |    56 +
 distribution-src/src/assemble/src.xml           |    38 +
 distribution/pom.xml                            |    70 -
 distribution/src/assemble/bin.xml               |   140 -
 distribution/src/assemble/src.xml               |    50 -
 distribution/src/main/resources/LICENSE-bin.txt |   790 -
 .../src/main/resources/NOTICE-bin.base.txt      |     8 -
 distribution/src/main/resources/NOTICE-bin.txt  |   132 -
 .../src/main/resources/license-notes.txt        |    17 -
 .../resources/notices/commons-el-1.0.jar.NOTICE |     0
 .../notices/commons-httpclient-3.0.1.jar.NOTICE |     0
 ...concurrentlinkedhashmap-lru-1.3.2.jar.NOTICE |     7 -
 .../main/resources/notices/generate-notice.sh   |    27 -
 .../resources/notices/guava-14.0.jar.NOTICE     |     0
 .../jackson-annotations-2.1.1.jar.NOTICE        |     0
 .../notices/jackson-core-2.1.1.jar.NOTICE       |     0
 .../notices/jackson-databind-2.1.1.jar.NOTICE   |     0
 .../notices/jakarta-regexp-1.4.jar.NOTICE       |     0
 .../notices/jasper-compiler-5.5.12.jar.NOTICE   |    18 -
 .../notices/jasper-runtime-5.5.12.jar.NOTICE    |    18 -
 .../resources/notices/jets3t-0.6.1.jar.NOTICE   |    18 -
 .../resources/notices/jetty-6.1.26.jar.NOTICE   |    36 -
 .../notices/jetty-util-6.1.26.jar.NOTICE        |    36 -
 .../notices/metrics-core-2.2.0.jar.NOTICE       |    11 -
 .../notices/metrics-ganglia-2.2.0.jar.NOTICE    |    11 -
 .../notices/metrics-graphite-2.2.0.jar.NOTICE   |    11 -
 .../notices/metrics-servlet-2.2.0.jar.NOTICE    |    11 -
 .../main/resources/notices/oro-2.0.8.jar.NOTICE |     0
 .../resources/notices/spatial4j-0.3.jar.NOTICE  |     0
 .../notices/zookeeper-3.4.5.jar.NOTICE          |     5 -
 distribution/src/main/scripts/bin/blur          |    37 -
 .../src/main/scripts/bin/blur-config.sh         |    88 -
 .../src/main/scripts/bin/controllers.sh         |    34 -
 distribution/src/main/scripts/bin/shards.sh     |    34 -
 distribution/src/main/scripts/bin/start-all.sh  |    27 -
 .../main/scripts/bin/start-controller-server.sh |    41 -
 .../src/main/scripts/bin/start-controllers.sh   |    24 -
 .../src/main/scripts/bin/start-shard-server.sh  |    43 -
 .../src/main/scripts/bin/start-shards.sh        |    25 -
 .../main/scripts/bin/start-zookeeper-server.sh  |    39 -
 .../src/main/scripts/bin/start-zookeepers.sh    |    25 -
 distribution/src/main/scripts/bin/stop-all.sh   |    27 -
 .../main/scripts/bin/stop-controller-server.sh  |    38 -
 .../src/main/scripts/bin/stop-controllers.sh    |    24 -
 .../src/main/scripts/bin/stop-shard-server.sh   |    38 -
 .../src/main/scripts/bin/stop-shards.sh         |    27 -
 .../main/scripts/bin/stop-zookeeper-server.sh   |    37 -
 .../src/main/scripts/bin/stop-zookeepers.sh     |    24 -
 distribution/src/main/scripts/bin/zookeepers.sh |    34 -
 distribution/src/main/scripts/conf/blur-env.sh  |    67 -
 .../src/main/scripts/conf/blur-site.properties  |    27 -
 distribution/src/main/scripts/conf/controllers  |     1 -
 .../src/main/scripts/conf/default_zoo.cfg       |    16 -
 .../src/main/scripts/conf/log4j-command.xml     |    37 -
 distribution/src/main/scripts/conf/log4j.xml    |    96 -
 distribution/src/main/scripts/conf/shards       |     1 -
 distribution/src/main/scripts/conf/zookeepers   |     2 -
 .../src/main/scripts/interface/Blur.thrift      |  1246 -
 .../src/main/scripts/interface/apache.header    |    19 -
 .../main/scripts/interface/gen-html/Blur.html   |   960 -
 .../main/scripts/interface/gen-html/index.html  |    93 -
 .../main/scripts/interface/gen-html/style.css   |   184 -
 .../org/apache/blur/thrift/generated/Blur.java  | 40418 -----------------
 .../blur/thrift/generated/BlurException.java    |   649 -
 .../apache/blur/thrift/generated/BlurQuery.java |  1979 -
 .../blur/thrift/generated/BlurQueryStatus.java  |  1188 -
 .../blur/thrift/generated/BlurResult.java       |   813 -
 .../blur/thrift/generated/BlurResults.java      |  1208 -
 .../apache/blur/thrift/generated/Column.java    |   532 -
 .../blur/thrift/generated/ColumnDefinition.java |  1187 -
 .../apache/blur/thrift/generated/CpuTime.java   |   524 -
 .../apache/blur/thrift/generated/ErrorType.java |    83 -
 .../org/apache/blur/thrift/generated/Facet.java |   552 -
 .../thrift/generated/FetchRecordResult.java     |   537 -
 .../blur/thrift/generated/FetchResult.java      |   871 -
 .../blur/thrift/generated/FetchRowResult.java   |   859 -
 .../blur/thrift/generated/HighlightOptions.java |   671 -
 .../org/apache/blur/thrift/generated/Level.java |    85 -
 .../apache/blur/thrift/generated/Metric.java    |   945 -
 .../org/apache/blur/thrift/generated/Query.java |   896 -
 .../blur/thrift/generated/QueryState.java       |    78 -
 .../apache/blur/thrift/generated/Record.java    |   698 -
 .../blur/thrift/generated/RecordMutation.java   |   548 -
 .../thrift/generated/RecordMutationType.java    |    79 -
 .../org/apache/blur/thrift/generated/Row.java   |   590 -
 .../blur/thrift/generated/RowMutation.java      |   821 -
 .../blur/thrift/generated/RowMutationType.java  |    75 -
 .../apache/blur/thrift/generated/Schema.java    |   648 -
 .../apache/blur/thrift/generated/ScoreType.java |    79 -
 .../apache/blur/thrift/generated/Selector.java  |  1654 -
 .../blur/thrift/generated/ShardState.java       |    87 -
 .../apache/blur/thrift/generated/SortField.java |   603 -
 .../blur/thrift/generated/SortFieldResult.java  |   677 -
 .../apache/blur/thrift/generated/Status.java    |    70 -
 .../blur/thrift/generated/TableDescriptor.java  |  2212 -
 .../blur/thrift/generated/TableStats.java       |   742 -
 .../org/apache/blur/thrift/generated/User.java  |   596 -
 .../src/main/scripts/interface/gen-js/Blur.js   |  7342 ---
 .../main/scripts/interface/gen-js/Blur_types.js |  3641 --
 .../scripts/interface/gen-perl/Blur/Blur.pm     | 10090 ----
 .../interface/gen-perl/Blur/Constants.pm        |    13 -
 .../scripts/interface/gen-perl/Blur/Types.pm    |  3806 --
 .../src/main/scripts/interface/gen-rb/blur.rb   |  2713 --
 .../scripts/interface/gen-rb/blur_constants.rb  |    11 -
 .../main/scripts/interface/gen-rb/blur_types.rb |   934 -
 .../src/main/scripts/interface/genAndReplace.sh |    41 -
 distribution/src/main/scripts/logs/.empty       |     0
 distribution/src/main/scripts/pids/.empty       |     0
 pom.xml                                         |     6 +-
 source_me_2_switch_2_hadoop1.sh                 |     2 +
 source_me_2_switch_2_hadoop2.sh                 |     2 +
 310 files changed, 194908 insertions(+), 97713 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/7395b9cb/blur-core/pom.xml
----------------------------------------------------------------------
diff --git a/blur-core/pom.xml b/blur-core/pom.xml
index 300e0b8..c716715 100644
--- a/blur-core/pom.xml
+++ b/blur-core/pom.xml
@@ -163,7 +163,7 @@ under the License.
 			<id>hadoop-1x</id>
 			<activation>
 				<property>
-					<name>hadoop1</name>
+					<name>env.hadoop1</name>
 				</property>
 			</activation>
 			<dependencies>
@@ -179,7 +179,7 @@ under the License.
 			<id>hadoop-2.2</id>
 			<activation>
 				<property>
-					<name>hadoop2</name>
+					<name>env.hadoop2</name>
 				</property>
 			</activation>
 			<dependencies>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/7395b9cb/blur-gui/pom.xml
----------------------------------------------------------------------
diff --git a/blur-gui/pom.xml b/blur-gui/pom.xml
index 9881210..4994f85 100644
--- a/blur-gui/pom.xml
+++ b/blur-gui/pom.xml
@@ -150,7 +150,7 @@ under the License.
 			<id>hadoop-1x</id>
 			<activation>
 				<property>
-					<name>hadoop1</name>
+					<name>env.hadoop1</name>
 				</property>
 			</activation>
 		</profile>
@@ -158,7 +158,7 @@ under the License.
 			<id>hadoop-2.2</id>
 			<activation>
 				<property>
-					<name>hadoop2</name>
+					<name>env.hadoop2</name>
 				</property>
 			</activation>
 			<dependencies>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/7395b9cb/blur-mapred/pom.xml
----------------------------------------------------------------------
diff --git a/blur-mapred/pom.xml b/blur-mapred/pom.xml
index 7e8bbc7..c6e187a 100644
--- a/blur-mapred/pom.xml
+++ b/blur-mapred/pom.xml
@@ -145,7 +145,7 @@ under the License.
 			<id>hadoop-1x</id>
 			<activation>
 				<property>
-					<name>hadoop1</name>
+					<name>env.hadoop1</name>
 				</property>
 			</activation>
 			<dependencies>
@@ -168,7 +168,7 @@ under the License.
 			<id>hadoop-2.2</id>
 			<activation>
 				<property>
-					<name>hadoop2</name>
+					<name>env.hadoop2</name>
 				</property>
 			</activation>
 			<dependencies>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/7395b9cb/blur-shell/pom.xml
----------------------------------------------------------------------
diff --git a/blur-shell/pom.xml b/blur-shell/pom.xml
index 4a6278a..3f34367 100644
--- a/blur-shell/pom.xml
+++ b/blur-shell/pom.xml
@@ -78,8 +78,6 @@ under the License.
     </dependencies>
 
     <build>
-        <finalName>blur-shell-${project.version}</finalName>
-
         <plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -102,30 +100,50 @@ under the License.
 			  <target>1.6</target>
 			</configuration>
 		  </plugin>
-
-          <plugin>
-            <artifactId>maven-assembly-plugin</artifactId>
-            <version>2.3</version>
-            <configuration>
-              <descriptorRefs>
-                <descriptorRef>jar-with-dependencies</descriptorRef>
-              </descriptorRefs>
-              <archive>
-                <manifest>
-                  <mainClass>org.apache.blur.shell.Main</mainClass>
-                </manifest>
-              </archive>
-            </configuration>
-            <executions>
-              <execution>
-                <id>make-assembly</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>single</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
         </plugins>
     </build>
+    <profiles>
+		<profile>
+			<id>hadoop-1x</id>
+			<activation>
+				<property>
+					<name>env.hadoop1</name>
+				</property>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>org.apache.hadoop</groupId>
+					<artifactId>hadoop-core</artifactId>
+					<version>${hadoop.version}</version>
+				</dependency>
+				<dependency>
+					<groupId>org.apache.hadoop</groupId>
+					<artifactId>hadoop-test</artifactId>
+					<version>${hadoop.version}</version>
+					<scope>test</scope>
+				</dependency>
+			</dependencies>
+		</profile>
+		<profile>
+			<id>hadoop-2.2</id>
+			<activation>
+				<property>
+					<name>env.hadoop2</name>
+				</property>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>org.apache.hadoop</groupId>
+					<artifactId>hadoop-client</artifactId>
+					<version>${hadoop.version}</version>
+				</dependency>
+				<dependency>
+					<groupId>org.apache.hadoop</groupId>
+					<artifactId>hadoop-minicluster</artifactId>
+					<version>${hadoop.version}</version>
+					<scope>test</scope>
+				</dependency>
+			</dependencies>
+		</profile>
+	</profiles>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/7395b9cb/blur-store/pom.xml
----------------------------------------------------------------------
diff --git a/blur-store/pom.xml b/blur-store/pom.xml
index 94a00bd..b37b185 100644
--- a/blur-store/pom.xml
+++ b/blur-store/pom.xml
@@ -154,12 +154,17 @@ under the License.
 			<id>hadoop-1x</id>
 			<activation>
 				<property>
-					<name>hadoop1</name>
+					<name>env.hadoop1</name>
 				</property>
 			</activation>
 			<dependencies>
 				<dependency>
 					<groupId>org.apache.hadoop</groupId>
+					<artifactId>hadoop-core</artifactId>
+					<version>${hadoop.version}</version>
+				</dependency>
+				<dependency>
+					<groupId>org.apache.hadoop</groupId>
 					<artifactId>hadoop-test</artifactId>
 					<version>${hadoop.version}</version>
 					<scope>test</scope>
@@ -170,7 +175,7 @@ under the License.
 			<id>hadoop-2.2</id>
 			<activation>
 				<property>
-					<name>hadoop2</name>
+					<name>env.hadoop2</name>
 				</property>
 			</activation>
 			<dependencies>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/7395b9cb/distribution-hadoop1/pom.xml
----------------------------------------------------------------------
diff --git a/distribution-hadoop1/pom.xml b/distribution-hadoop1/pom.xml
new file mode 100644
index 0000000..97ffe9a
--- /dev/null
+++ b/distribution-hadoop1/pom.xml
@@ -0,0 +1,65 @@
+<?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
+
+  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/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.apache.blur</groupId>
+		<artifactId>blur</artifactId>
+		<version>0.2.2-incubating-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+
+	<artifactId>apache-blur</artifactId>
+	<packaging>pom</packaging>
+	<name>Distribution</name>
+	<version>0.2.2-incubating-SNAPSHOT-hadoop1</version>
+	<description>The Blur distribution module builds the binary artifact for hadoop1.</description>
+
+    <dependencies>
+		<dependency>
+			<groupId>org.apache.blur</groupId>
+			<artifactId>blur-mapred</artifactId>
+			<version>${project.parent.version}</version>
+		</dependency>
+    </dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>distro-assembly</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+						<configuration>
+							<descriptors>
+								<descriptor>src/assemble/bin.xml</descriptor>
+							</descriptors>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/7395b9cb/distribution-hadoop1/src/assemble/bin.xml
----------------------------------------------------------------------
diff --git a/distribution-hadoop1/src/assemble/bin.xml b/distribution-hadoop1/src/assemble/bin.xml
new file mode 100644
index 0000000..bae2e5e
--- /dev/null
+++ b/distribution-hadoop1/src/assemble/bin.xml
@@ -0,0 +1,140 @@
+<!--
+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.
+-->
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+  <id>bin</id>
+  <formats>
+    <format>tar.gz</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+
+  <dependencySets>
+    <dependencySet>
+      <useProjectArtifact>false</useProjectArtifact>
+      <outputDirectory>apache-blur-${project.version}-bin/lib</outputDirectory>
+      <unpack>false</unpack>
+      <includes>
+        <include>org.apache.blur:*</include>
+
+        <include>org.apache.zookeeper:zookeeper</include>
+        <include>org.slf4j:slf4j-api</include>
+        <include>org.slf4j:slf4j-log4j12</include>
+        <include>org.json:json</include>
+        <include>log4j:log4j</include>
+        <include>com.yammer.metrics:*</include>
+        <include>com.google.guava:guava</include>
+        <include>org.apache.httpcomponents:*</include>
+        <include>org.apache.lucene:*</include>
+        <include>com.spatial4j:spatial4j</include>
+        <include>commons-cli:commons-cli</include>
+        <include>com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru</include>
+        <include>jline:jline</include>
+        <include>com.fasterxml.jackson.core:*</include>
+      </includes>
+    </dependencySet>
+    <dependencySet>
+      <useProjectArtifact>false</useProjectArtifact>
+      <outputDirectory>apache-blur-${project.version}-bin/lib/hadoop-${hadoop.version}</outputDirectory>
+      <unpack>false</unpack>
+	<includes>
+	  <include>org.apache.hadoop:*</include>
+	</includes>
+    </dependencySet>
+    <dependencySet>
+      <useProjectArtifact>false</useProjectArtifact>
+      <outputDirectory>apache-blur-${project.version}-bin/lib/hadoop-${hadoop.version}/lib</outputDirectory>
+      <unpack>false</unpack>
+	<excludes>
+	  <exclude>org.apache.blur:*</exclude>
+
+      <!-- No need to package eclipse stuff in there -->
+	  <exclude>org.eclipse.jdt:core</exclude>
+
+      <!-- Removing dup -->
+	  <exclude>org.apache.hadoop:hadoop-core</exclude>
+
+	  <exclude>org.apache.zookeeper:zookeeper</exclude>
+	  <exclude>org.slf4j:slf4j-api</exclude>
+	  <exclude>org.slf4j:slf4j-log4j12</exclude>
+	  <exclude>org.json:json</exclude>
+	  <exclude>log4j:log4j</exclude>
+	  <exclude>com.yammer.metrics:*</exclude>
+	  <exclude>com.google.guava:guava</exclude>
+	  <exclude>org.apache.httpcomponents:*</exclude>
+	  <exclude>org.apache.lucene:*</exclude>
+      <exclude>com.spatial4j:spatial4j</exclude>
+	  <exclude>commons-cli:commons-cli</exclude>
+	  <exclude>com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru</exclude>
+	  <exclude>jline:jline</exclude>
+      <exclude>com.fasterxml.jackson.core:*</exclude>
+	</excludes>
+    </dependencySet>
+  </dependencySets>
+
+  <fileSets>
+      <!--
+         Adds startup scripts to the root directory of zip package. The startup
+         scripts are located to src/main/scripts directory as stated by Maven
+         conventions.
+     -->
+    <fileSet>
+      <directory>${project.build.scriptSourceDirectory}</directory>
+      <outputDirectory>apache-blur-${project.version}-bin</outputDirectory>
+      <excludes>
+        <exclude>**/.empty</exclude>
+      </excludes>
+    </fileSet>
+    <fileSet>
+      <directory>${project.build.scriptSourceDirectory}/../../../../docs</directory>
+      <outputDirectory>apache-blur-${project.version}-bin/docs</outputDirectory>
+      <excludes>
+        <exclude>**/.empty</exclude>
+      </excludes>
+    </fileSet>
+    <fileSet>
+      <directory>${project.build.scriptSourceDirectory}/../../../../target/staging</directory>
+      <outputDirectory>apache-blur-${project.version}-bin/docs/site</outputDirectory>
+      <excludes>
+        <exclude>**/.empty</exclude>
+      </excludes>
+    </fileSet>
+    <fileSet>
+      <directory>${project.build.scriptSourceDirectory}/../../../../</directory>
+      <outputDirectory>apache-blur-${project.version}-bin/</outputDirectory>
+      <includes>
+        <include>DISCLAIMER</include>
+        <include>README</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+
+  <files>
+    <file>
+      <source>${project.build.scriptSourceDirectory}/../resources/NOTICE-bin.txt</source>
+      <outputDirectory>apache-blur-${project.version}-bin</outputDirectory>
+      <destName>NOTICE</destName>
+    </file>
+    <file>
+      <source>${project.build.scriptSourceDirectory}/../resources/LICENSE-bin.txt</source>
+      <outputDirectory>apache-blur-${project.version}-bin</outputDirectory>
+      <destName>LICENSE</destName>
+    </file>
+  </files>
+</assembly>


Mime
View raw message