Author: ctubbsii
Date: Sat Jan 19 16:37:57 2013
New Revision: 1435592
URL: http://svn.apache.org/viewvc?rev=1435592&view=rev
Log:
ACCUMULO-979 Point the generate-thrift script for the proxy to the core, to get
any future benefits from changes to that script; rename the maven tasks for
building scripts, because they were misleading
Modified:
accumulo/trunk/core/pom.xml
accumulo/trunk/proxy/pom.xml
accumulo/trunk/proxy/src/main/scripts/generate-thrift.sh
accumulo/trunk/trace/pom.xml
Modified: accumulo/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/pom.xml?rev=1435592&r1=1435591&r2=1435592&view=diff
==============================================================================
--- accumulo/trunk/core/pom.xml (original)
+++ accumulo/trunk/core/pom.xml Sat Jan 19 16:37:57 2013
@@ -44,7 +44,7 @@
<artifactId>exec-maven-plugin</artifactId>
<executions>
<execution>
- <id>generate-core-thrift</id>
+ <id>generate-thrift</id>
<phase>generate-sources</phase>
<goals>
<goal>exec</goal>
Modified: accumulo/trunk/proxy/pom.xml
URL:
http://svn.apache.org/viewvc/accumulo/trunk/proxy/pom.xml?rev=1435592&r1=1435591&r2=1435592&view=diff
==============================================================================
--- accumulo/trunk/proxy/pom.xml (original)
+++ accumulo/trunk/proxy/pom.xml Sat Jan 19 16:37:57 2013
@@ -46,7 +46,7 @@
<artifactId>exec-maven-plugin</artifactId>
<executions>
<execution>
- <id>generate-core-thrift</id>
+ <id>generate-thrift</id>
<phase>generate-sources</phase>
<goals>
<goal>exec</goal>
Modified: accumulo/trunk/proxy/src/main/scripts/generate-thrift.sh
URL:
http://svn.apache.org/viewvc/accumulo/trunk/proxy/src/main/scripts/generate-thrift.sh?rev=1435592&r1=1435591&r2=1435592&view=diff
==============================================================================
--- accumulo/trunk/proxy/src/main/scripts/generate-thrift.sh (original)
+++ accumulo/trunk/proxy/src/main/scripts/generate-thrift.sh Sat Jan 19
16:37:57 2013
@@ -15,96 +15,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# This script will regenerate the thrift code for Accumulo's RPC mechanisms.
+# This script will regenerate the thrift code for cloudtrace.
+INCLUDED_MODULES=(-)
+BASE_OUTPUT_PACKAGE='org.apache.accumulo'
+PACKAGES_TO_GENERATE=(proxy)
-# NOTES:
-# To support this script being called by other modules, only edit the right
side.
-# In other scripts, set the variables that diverge from the defaults below,
then call this script.
-# PACKAGES_TO_GENERATE should be an array, and each element should be the
portion of the dot-separated Java package
-# name following the BASE_OUTPUT_PACKAGE
-# Leave the BUILD_DIR and FINAL_DIR alone for Maven builds.
-# INCLUDED_MODULES should be an array that includes other Maven modules with
src/main/thrift directories
-# Use INCLUDED_MODULES=(-) in calling scripts that require no other modules
-#
========================================================================================================================
-[ -z $REQUIRED_THRIFT_VERSION ] && REQUIRED_THRIFT_VERSION='0.9'
-[ -z $INCLUDED_MODULES ] && INCLUDED_MODULES=
-[ -z $BASE_OUTPUT_PACKAGE ] && BASE_OUTPUT_PACKAGE='org.apache.accumulo'
-[ -z $PACKAGES_TO_GENERATE ] && PACKAGES_TO_GENERATE=(proxy)
-[ -z $BUILD_DIR ] && BUILD_DIR='target'
-[ -z $FINAL_DIR ] && FINAL_DIR='src/main/java'
-#
========================================================================================================================
+. ../core/src/main/scripts/generate-thrift.sh
-fail() {
- echo $@
- exit 1
-}
-
-# Test to see if we have thrift installed
-VERSION=$(thrift -version 2>/dev/null | grep -F "${REQUIRED_THRIFT_VERSION}" |
wc -l)
-if [ "$VERSION" -ne 1 ] ; then
- # Nope: bail
- echo "****************************************************"
- echo "*** thrift is not available"
- echo "*** expecting 'thrift -version' to return ${REQUIRED_THRIFT_VERSION}"
- echo "*** generated code will not be updated"
- echo "****************************************************"
- exit 0
-fi
-
-# Include thrift sources from additional modules
-THRIFT_ARGS=''
-for i in "${INCLUDED_MODULES[@]}"; do
- if [ ${i} != '-' ]; then
- test -d ${i} || fail missing required included module ${i}
- THRIFT_ARGS="${THRIFT_ARGS} -I ${i}/src/main/thrift"
- fi
-done
-
-# Ensure output directories are created
-THRIFT_ARGS="${THRIFT_ARGS} -o $BUILD_DIR"
-mkdir -p $BUILD_DIR
-rm -rf $BUILD_DIR/gen-java
-for f in src/main/thrift/*.thrift; do
- thrift ${THRIFT_ARGS} --gen java $f || fail unable to generate java thrift
classes
- thrift ${THRIFT_ARGS} --gen py $f || fail unable to generate python thrift
classes
- thrift ${THRIFT_ARGS} --gen rb $f || fail unable to generate ruby thrift
classes
- thrift ${THRIFT_ARGS} --gen cpp $f || fail unable to generate cpp thrift
classes
-done
-
-# For all generated thrift code, suppress all warnings and add the LICENSE
header
-find $BUILD_DIR/gen-java -name '*.java' -print0 | xargs -0 sed -i.orig -e
's/public class /@SuppressWarnings("all") public class /'
-find $BUILD_DIR/gen-java -name '*.java' -print0 | xargs -0 sed -i.orig -e
's/public enum /@SuppressWarnings("all") public enum /'
-for f in $(find $BUILD_DIR/gen-java -name '*.java'); do
- cat - $f >${f}-with-license <<EOF
-/*
- * 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.
- */
-EOF
-done
-
-# For every generated java file, compare it with the version-controlled one,
and copy the ones that have changed into place
-for d in "${PACKAGES_TO_GENERATE[@]}"; do
- SDIR="${BUILD_DIR}/gen-java/${BASE_OUTPUT_PACKAGE//.//}/${d//.//}/thrift"
- DDIR="${FINAL_DIR}/${BASE_OUTPUT_PACKAGE//.//}/${d//.//}/thrift"
- mkdir -p "$DDIR"
- for f in "$SDIR"/*.java; do
- DEST="$DDIR/`basename $f`"
- if ! cmp -s "${f}-with-license" "${DEST}" ; then
- echo cp -f "${f}-with-license" "${DEST}"
- cp -f "${f}-with-license" "${DEST}" || fail unable to copy files to java
workspace
- fi
- done
-done
Modified: accumulo/trunk/trace/pom.xml
URL:
http://svn.apache.org/viewvc/accumulo/trunk/trace/pom.xml?rev=1435592&r1=1435591&r2=1435592&view=diff
==============================================================================
--- accumulo/trunk/trace/pom.xml (original)
+++ accumulo/trunk/trace/pom.xml Sat Jan 19 16:37:57 2013
@@ -43,7 +43,7 @@
<artifactId>exec-maven-plugin</artifactId>
<executions>
<execution>
- <id>generate-core-thrift</id>
+ <id>generate-thrift</id>
<phase>generate-sources</phase>
<goals>
<goal>exec</goal>
