You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ee...@apache.org on 2010/02/24 20:54:14 UTC
svn commit: r915953 - in /incubator/cassandra/trunk: ./
interface/thrift/gen-java/org/apache/cassandra/thrift/
Author: eevans
Date: Wed Feb 24 19:54:14 2010
New Revision: 915953
URL: http://svn.apache.org/viewvc?rev=915953&view=rev
Log:
merge w/ 0.6 branch
Added:
incubator/cassandra/trunk/.rat-excludes
- copied unchanged from r915952, incubator/cassandra/branches/cassandra-0.6/.rat-excludes
Modified:
incubator/cassandra/trunk/ (props changed)
incubator/cassandra/trunk/build.xml
incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java (props changed)
incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java (props changed)
incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java (props changed)
incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java (props changed)
incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java (props changed)
incubator/cassandra/trunk/ivy.xml
Propchange: incubator/cassandra/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 24 19:54:14 2010
@@ -1,4 +1,4 @@
/incubator/cassandra/branches/cassandra-0.3:774578-796573
/incubator/cassandra/branches/cassandra-0.4:810145-834239,834349-834350
/incubator/cassandra/branches/cassandra-0.5:888872-915439
-/incubator/cassandra/branches/cassandra-0.6:911237-915857
+/incubator/cassandra/branches/cassandra-0.6:911237-915952
Modified: incubator/cassandra/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/build.xml?rev=915953&r1=915952&r2=915953&view=diff
==============================================================================
--- incubator/cassandra/trunk/build.xml (original)
+++ incubator/cassandra/trunk/build.xml Wed Feb 24 19:54:14 2010
@@ -148,6 +148,16 @@
pattern="${build.dir.lib}/[type]s/[artifact]-[revision].[ext]" />
</target>
+ <target name="ivy-retrieve-build" depends="ivy-init,ivy-retrieve">
+ <ivy:retrieve type="jar,source" conf="build" sync="true"
+ pattern="${build.dir.lib}/[type]s/[artifact]-[revision].[ext]" />
+ </target>
+
+ <target name="ivy-retrieve-qa" depends="ivy-init,ivy-retrieve">
+ <ivy:retrieve type="jar,source" conf="qa" sync="true"
+ pattern="${build.dir.lib}/[type]s/[artifact]-[revision].[ext]" />
+ </target>
+
<!--
Generate avro code
-->
@@ -215,7 +225,7 @@
The build target builds all the .class files
-->
<target name="build"
- depends="ivy-retrieve,avro-generate,build-subprojects,build-project"/>
+ depends="ivy-retrieve-build,avro-generate,build-subprojects,build-project"/>
<target name="build-subprojects"/>
<target name="codecoverage" depends="cobertura-instrument,test,cobertura-report"/>
@@ -254,7 +264,7 @@
</target>
<!-- creates a release tarball -->
- <target name="release" depends="jar,javadoc">
+ <target name="release" depends="jar,javadoc,rat-init">
<mkdir dir="${dist.dir}"/>
<copy todir="${dist.dir}/lib">
<fileset dir="${build.lib}"/>
@@ -306,6 +316,15 @@
</not>
</tarfileset>
</tar>
+ <rat:report xmlns:rat="antlib:org.apache.rat.anttasks"
+ reportFile="${build.dir}/${final.name}-bin.rat.txt">
+ <tarfileset>
+ <gzipresource>
+ <file file="${build.dir}/${final.name}-bin.tar.gz" />
+ </gzipresource>
+ </tarfileset>
+ </rat:report>
+
<tar compression="gzip" longfile="gnu"
destfile="${build.dir}/${final.name}-src.tar.gz">
@@ -315,8 +334,17 @@
<exclude name="build/**" />
<exclude name="src/gen-java/**" />
<exclude name="interface/avro/**" />
+ <exclude name=".git/**" />
</tarfileset>
</tar>
+ <rat:report xmlns:rat="antlib:org.apache.rat.anttasks"
+ reportFile="${build.dir}/${final.name}-src.rat.txt">
+ <tarfileset>
+ <gzipresource>
+ <file file="${build.dir}/${final.name}-src.tar.gz" />
+ </gzipresource>
+ </tarfileset>
+ </rat:report>
</target>
<target name="build-test" depends="build" description="Build the Cassandra classes">
@@ -393,7 +421,51 @@
datafile="${cobertura.datafile}"/>
<cobertura-report format="xml" destdir="${cobertura.report.dir}" srcdir="${build.src}"
datafile="${cobertura.datafile}"/>
- </target>
+ </target>
+
+ <!--
+ License audit tool
+ -->
+ <target name="rat-init" depends="ivy-retrieve-qa">
+ <typedef resource="org/apache/rat/anttasks/antlib.xml"
+ uri="antlib:org.apache.rat.anttasks">
+ <classpath>
+ <fileset dir="${build.dir.lib}">
+ <include name="**/apache-rat*.jar"/>
+ <include name="**/commons-*.jar"/>
+ </fileset>
+ </classpath>
+ </typedef>
+ </target>
+
+ <target name="rat-check" depends="rat-init">
+ <rat:report xmlns:rat="antlib:org.apache.rat.anttasks"
+ reportFile="${build.dir}/rat-report.log">
+ <fileset dir="." excludesfile=".rat-excludes" />
+ </rat:report>
+ <condition property="rat.passed">
+ <isfileselected file="${build.dir}/rat-report.log">
+ <containsregexp expression="^0 Unknown Licenses"/>
+ </isfileselected>
+ </condition>
+ <fail unless="rat.passed">Unknown licenses: See build/rat-report.log.</fail>
+ </target>
+
+ <target name="rat-write" depends="rat-init">
+ <echo>RAT: invoking addLicense to write missing headers</echo>
+ <java classname="org.apache.rat.Report" fork="true"
+ output="${build.dir}/rat-report.log">
+ <classpath>
+ <fileset dir="${build.dir.lib}">
+ <include name="**/apache-rat*.jar"/>
+ <include name="**/commons-*.jar"/>
+ </fileset>
+ </classpath>
+ <arg value="-a" />
+ <arg value="--force" />
+ <arg value="." />
+ </java>
+ </target>
<target name="javadoc" depends="init">
<tstamp>
Propchange: incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 24 19:54:14 2010
@@ -1,6 +1,6 @@
/incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/Cassandra.java:774578-796573
/incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/Cassandra.java:810145-834239,834349-834350
/incubator/cassandra/branches/cassandra-0.5/interface/gen-java/org/apache/cassandra/service/Cassandra.java:888872-903502
-/incubator/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:911237-915857
+/incubator/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:911237-915952
/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Cassandra.java:749219-768588
/incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:749219-904544
Propchange: incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 24 19:54:14 2010
@@ -1,7 +1,7 @@
/incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/column_t.java:774578-792198
/incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/Column.java:810145-834239,834349-834350
/incubator/cassandra/branches/cassandra-0.5/interface/gen-java/org/apache/cassandra/service/Column.java:888872-903502
-/incubator/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:911237-915857
+/incubator/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:911237-915952
/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Column.java:749219-794428
/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/column_t.java:749219-768588
/incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:749219-904544
Propchange: incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 24 19:54:14 2010
@@ -1,6 +1,6 @@
/incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java:774578-796573
/incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java:810145-834239,834349-834350
/incubator/cassandra/branches/cassandra-0.5/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java:888872-903502
-/incubator/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:911237-915857
+/incubator/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:911237-915952
/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java:749219-768588
/incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:749219-904544
Propchange: incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 24 19:54:14 2010
@@ -1,5 +1,5 @@
/incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/NotFoundException.java:774578-796573
/incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/NotFoundException.java:810145-834239,834349-834350
/incubator/cassandra/branches/cassandra-0.5/interface/gen-java/org/apache/cassandra/service/NotFoundException.java:888872-903502
-/incubator/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:911237-915857
+/incubator/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:911237-915952
/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/NotFoundException.java:749219-768588
Propchange: incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 24 19:54:14 2010
@@ -1,7 +1,7 @@
/incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/superColumn_t.java:774578-792198
/incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/SuperColumn.java:810145-834239,834349-834350
/incubator/cassandra/branches/cassandra-0.5/interface/gen-java/org/apache/cassandra/service/SuperColumn.java:888872-903502
-/incubator/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:911237-915857
+/incubator/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:911237-915952
/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SuperColumn.java:749219-794428
/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/superColumn_t.java:749219-768588
/incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:749219-904544
Modified: incubator/cassandra/trunk/ivy.xml
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/ivy.xml?rev=915953&r1=915952&r2=915953&view=diff
==============================================================================
--- incubator/cassandra/trunk/ivy.xml (original)
+++ incubator/cassandra/trunk/ivy.xml Wed Feb 24 19:54:14 2010
@@ -18,6 +18,13 @@
-->
<ivy-module version="2.0">
<info organisation="apache-cassandra" module="cassandra"/>
+
+ <configurations defaultconfmapping="default">
+ <conf name="default"/>
+ <conf name="build" extends="default" />
+ <conf name="qa" extends="default" />
+ </configurations>
+
<dependencies>
<!-- for hadoop -->
<dependency org="commons-logging" name="commons-logging" rev="1.1.1"/>
@@ -26,7 +33,7 @@
<!-- FIXME: paranamer and jackson can be dropped after we're depending
on avro (since it depends on them). -->
- <dependency org="com.thoughtworks.paranamer"
+ <dependency org="com.thoughtworks.paranamer" conf="build->default"
name="paranamer-ant" rev="2.1"/>
<dependency org="org.codehaus.jackson"
name="jackson-mapper-asl" rev="1.4.0"/>
@@ -41,7 +48,10 @@
<dependency org="org.slf4j" name="slf4j-api" rev="1.5.8"/>
<dependency org="org.slf4j" name="slf4j-log4j12" rev="1.5.8"/>
<dependency org="com.googlecode.json-simple" name="json-simple" rev="1.1"/>
- <dependency org="junit" name="junit" rev="4.6"/>
+ <dependency org="junit" name="junit" rev="4.6" conf="build->default" />
+
+ <dependency org="org.apache.rat" name="apache-rat" rev="0.6"
+ conf="qa->default"/>
<dependency org="org.mortbay.jetty" name="jetty" rev="6.1.21"/>
</dependencies>
</ivy-module>