Modified: accumulo/trunk/trace/pom.xml URL: http://svn.apache.org/viewvc/accumulo/trunk/trace/pom.xml?rev=1429190&r1=1429189&r2=1429190&view=diff ============================================================================== --- accumulo/trunk/trace/pom.xml (original) +++ accumulo/trunk/trace/pom.xml Sat Jan 5 01:56:36 2013 @@ -37,6 +37,24 @@ </plugin> </plugins> </pluginManagement> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <executions> + <execution> + <id>generate-core-thrift</id> + <phase>generate-sources</phase> + <goals> + <goal>exec</goal> + </goals> + <configuration> + <executable>${basedir}/src/main/scripts/generate-thrift.sh</executable> + </configuration> + </execution> + </executions> + </plugin> + </plugins> </build> <dependencies>
Modified: accumulo/trunk/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/RemoteSpan.java URL: http://svn.apache.org/viewvc/accumulo/trunk/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/RemoteSpan.java?rev=1429190&r1=1429189&r2=1429190&view=diff ============================================================================== --- accumulo/trunk/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/RemoteSpan.java (original) +++ accumulo/trunk/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/RemoteSpan.java Sat Jan 5 01:56:36 2013 @@ -1,3 +1,19 @@ +/* + * 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. + */ /** * Autogenerated by Thrift Compiler (0.9.0) * Modified: accumulo/trunk/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/SpanReceiver.java URL: http://svn.apache.org/viewvc/accumulo/trunk/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/SpanReceiver.java?rev=1429190&r1=1429189&r2=1429190&view=diff ============================================================================== --- accumulo/trunk/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/SpanReceiver.java (original) +++ accumulo/trunk/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/SpanReceiver.java Sat Jan 5 01:56:36 2013 @@ -1,3 +1,19 @@ +/* + * 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. + */ /** * Autogenerated by Thrift Compiler (0.9.0) * Modified: accumulo/trunk/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/TInfo.java URL: http://svn.apache.org/viewvc/accumulo/trunk/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/TInfo.java?rev=1429190&r1=1429189&r2=1429190&view=diff ============================================================================== --- accumulo/trunk/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/TInfo.java (original) +++ accumulo/trunk/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/TInfo.java Sat Jan 5 01:56:36 2013 @@ -1,3 +1,19 @@ +/* + * 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. + */ /** * Autogenerated by Thrift Compiler (0.9.0) * Modified: accumulo/trunk/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/TestService.java URL: http://svn.apache.org/viewvc/accumulo/trunk/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/TestService.java?rev=1429190&r1=1429189&r2=1429190&view=diff ============================================================================== --- accumulo/trunk/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/TestService.java (original) +++ accumulo/trunk/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/TestService.java Sat Jan 5 01:56:36 2013 @@ -1,3 +1,19 @@ +/* + * 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. + */ /** * Autogenerated by Thrift Compiler (0.9.0) * Copied: accumulo/trunk/trace/src/main/scripts/generate-thrift.sh (from r1429134, accumulo/trunk/trace/thrift.sh) URL: http://svn.apache.org/viewvc/accumulo/trunk/trace/src/main/scripts/generate-thrift.sh?p2=accumulo/trunk/trace/src/main/scripts/generate-thrift.sh&p1=accumulo/trunk/trace/thrift.sh&r1=1429134&r2=1429190&rev=1429190&view=diff ============================================================================== --- accumulo/trunk/trace/thrift.sh (original) +++ accumulo/trunk/trace/src/main/scripts/generate-thrift.sh Sat Jan 5 01:56:36 2013 @@ -15,27 +15,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -# This script will regenerate the thrift code for cloudtrace. This should be run at least whenever the thrift code is changed. There is no harm, besides wasted -# cycles, from running it more often then that. +# This script will regenerate the thrift code for cloudtrace. +INCLUDED_MODULES=(-) +BASE_OUTPUT_PACKAGE='org.apache.accumulo' +PACKAGES_TO_GENERATE=(cloudtrace) -# Generates the cloudtrace thrift code. We're explicitly using thrift0.6 because other versions -# are not compatible -thrift -o target --gen java src/main/thrift/cloudtrace.thrift -thrift -o target --gen cpp src/main/thrift/cloudtrace.thrift +. ../core/src/main/scripts/generate-thrift.sh -# For all generated thrift code, suppress all warnings -find target/gen-java -name '*.java' -print | xargs sed -i.orig -e 's/public class /@SuppressWarnings("all") public class /' -find target/gen-java -name '*.java' -print | xargs sed -i.orig -e 's/public enum /@SuppressWarnings("all") public enum /' - -# Make a directory for said thrift code if does not already exist -mkdir -p src/main/java/org/apache/accumulo/cloudtrace/thrift - -# For every file, move it with the appropriate path name IFF they are different -for f in target/gen-java/org/apache/accumulo/cloudtrace/thrift/* -do - DEST=src/main/java/org/apache/accumulo/cloudtrace/thrift/`basename $f` - if ! cmp -s $f $DEST ; then - echo cp $f $DEST - cp $f $DEST - fi -done
