You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2014/06/27 18:20:48 UTC
[1/3] git commit: ACCUMULO-2646 Move example config generation to
script
Repository: accumulo
Updated Branches:
refs/heads/1.6.1-SNAPSHOT 037ad964b -> be62a67b1
refs/heads/master 560beced6 -> 23e6ea8dd
ACCUMULO-2646 Move example config generation to script
An external script is a bit cleaner than calling bash inline in the pom.xml
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/be62a67b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/be62a67b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/be62a67b
Branch: refs/heads/1.6.1-SNAPSHOT
Commit: be62a67b1f2a0586eaad5a8bf3c9056e2bb19579
Parents: 037ad96
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri Jun 27 11:14:19 2014 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri Jun 27 11:38:48 2014 -0400
----------------------------------------------------------------------
assemble/pom.xml | 6 +----
.../main/scripts/generate-example-configs.sh | 25 ++++++++++++++++++++
2 files changed, 26 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/be62a67b/assemble/pom.xml
----------------------------------------------------------------------
diff --git a/assemble/pom.xml b/assemble/pom.xml
index 505f0f9..81afc0f 100644
--- a/assemble/pom.xml
+++ b/assemble/pom.xml
@@ -174,11 +174,7 @@
</goals>
<phase>generate-resources</phase>
<configuration>
- <executable>bash</executable>
- <arguments>
- <argument>-c</argument>
- <argument>for s in 1GB 2GB 3GB 512MB; do bin/bootstrap_config.sh -o -d target/example-configs/$s/standalone -s $s -j -v 2; bin/bootstrap_config.sh -o -d target/example-configs/$s/native-standalone -s $s -n -v 2; done</argument>
- </arguments>
+ <executable>${basedir}/src/main/scripts/generate-example-configs.sh</executable>
</configuration>
</execution>
</executions>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/be62a67b/assemble/src/main/scripts/generate-example-configs.sh
----------------------------------------------------------------------
diff --git a/assemble/src/main/scripts/generate-example-configs.sh b/assemble/src/main/scripts/generate-example-configs.sh
new file mode 100755
index 0000000..16c9f4f
--- /dev/null
+++ b/assemble/src/main/scripts/generate-example-configs.sh
@@ -0,0 +1,25 @@
+#! /usr/bin/env bash
+
+# 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.
+
+# This script will regenerate the example configuration files for the tarball
+
+for s in 1GB 2GB 3GB 512MB
+do
+ bin/bootstrap_config.sh -o -d target/example-configs/$s/standalone -s $s -j -v 2
+ bin/bootstrap_config.sh -o -d target/example-configs/$s/native-standalone -s $s -n -v 2
+done
+
[3/3] git commit: Merge branch '1.6.1-SNAPSHOT'
Posted by ct...@apache.org.
Merge branch '1.6.1-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/23e6ea8d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/23e6ea8d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/23e6ea8d
Branch: refs/heads/master
Commit: 23e6ea8dd672faf4ff4c719666da30ffe6762e40
Parents: 560bece be62a67
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri Jun 27 12:20:03 2014 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri Jun 27 12:20:03 2014 -0400
----------------------------------------------------------------------
assemble/pom.xml | 6 +----
.../main/scripts/generate-example-configs.sh | 25 ++++++++++++++++++++
2 files changed, 26 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/23e6ea8d/assemble/pom.xml
----------------------------------------------------------------------
[2/3] git commit: ACCUMULO-2646 Move example config generation to
script
Posted by ct...@apache.org.
ACCUMULO-2646 Move example config generation to script
An external script is a bit cleaner than calling bash inline in the pom.xml
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/be62a67b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/be62a67b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/be62a67b
Branch: refs/heads/master
Commit: be62a67b1f2a0586eaad5a8bf3c9056e2bb19579
Parents: 037ad96
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri Jun 27 11:14:19 2014 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri Jun 27 11:38:48 2014 -0400
----------------------------------------------------------------------
assemble/pom.xml | 6 +----
.../main/scripts/generate-example-configs.sh | 25 ++++++++++++++++++++
2 files changed, 26 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/be62a67b/assemble/pom.xml
----------------------------------------------------------------------
diff --git a/assemble/pom.xml b/assemble/pom.xml
index 505f0f9..81afc0f 100644
--- a/assemble/pom.xml
+++ b/assemble/pom.xml
@@ -174,11 +174,7 @@
</goals>
<phase>generate-resources</phase>
<configuration>
- <executable>bash</executable>
- <arguments>
- <argument>-c</argument>
- <argument>for s in 1GB 2GB 3GB 512MB; do bin/bootstrap_config.sh -o -d target/example-configs/$s/standalone -s $s -j -v 2; bin/bootstrap_config.sh -o -d target/example-configs/$s/native-standalone -s $s -n -v 2; done</argument>
- </arguments>
+ <executable>${basedir}/src/main/scripts/generate-example-configs.sh</executable>
</configuration>
</execution>
</executions>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/be62a67b/assemble/src/main/scripts/generate-example-configs.sh
----------------------------------------------------------------------
diff --git a/assemble/src/main/scripts/generate-example-configs.sh b/assemble/src/main/scripts/generate-example-configs.sh
new file mode 100755
index 0000000..16c9f4f
--- /dev/null
+++ b/assemble/src/main/scripts/generate-example-configs.sh
@@ -0,0 +1,25 @@
+#! /usr/bin/env bash
+
+# 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.
+
+# This script will regenerate the example configuration files for the tarball
+
+for s in 1GB 2GB 3GB 512MB
+do
+ bin/bootstrap_config.sh -o -d target/example-configs/$s/standalone -s $s -j -v 2
+ bin/bootstrap_config.sh -o -d target/example-configs/$s/native-standalone -s $s -n -v 2
+done
+