You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2011/09/09 16:56:48 UTC
svn commit: r1167233 - in /cassandra/branches/cassandra-1.0: ./ contrib/
drivers/ interface/thrift/gen-java/org/apache/cassandra/thrift/ test/system/
Author: slebresne
Date: Fri Sep 9 14:56:47 2011
New Revision: 1167233
URL: http://svn.apache.org/viewvc?rev=1167233&view=rev
Log:
merge from 1.0.0
Modified:
cassandra/branches/cassandra-1.0/ (props changed)
cassandra/branches/cassandra-1.0/build.xml
cassandra/branches/cassandra-1.0/contrib/ (props changed)
cassandra/branches/cassandra-1.0/drivers/
cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java (props changed)
cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java (props changed)
cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java (props changed)
cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java (props changed)
cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java (props changed)
cassandra/branches/cassandra-1.0/test/system/test_cql.py
Propchange: cassandra/branches/cassandra-1.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 9 14:56:47 2011
@@ -5,7 +5,7 @@
/cassandra/branches/cassandra-0.8.0:1125021-1130369
/cassandra/branches/cassandra-0.8.1:1101014-1125018
/cassandra/branches/cassandra-1.0:1167106,1167185
-/cassandra/branches/cassandra-1.0.0:1167106,1167185
+/cassandra/branches/cassandra-1.0.0:1167106,1167185,1167230-1167231
/cassandra/tags/cassandra-0.7.0-rc3:1051699-1053689
/cassandra/tags/cassandra-0.8.0-rc1:1102511-1125020
/incubator/cassandra/branches/cassandra-0.3:774578-796573
Modified: cassandra/branches/cassandra-1.0/build.xml
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/build.xml?rev=1167233&r1=1167232&r2=1167233&view=diff
==============================================================================
--- cassandra/branches/cassandra-1.0/build.xml (original)
+++ cassandra/branches/cassandra-1.0/build.xml Fri Sep 9 14:56:47 2011
@@ -36,7 +36,6 @@
<property name="build.src" value="${basedir}/src"/>
<property name="build.src.java" value="${basedir}/src/java"/>
<property name="build.src.resources" value="${basedir}/src/resources"/>
- <property name="build.src.driver" value="${basedir}/drivers/java/src" />
<property name="avro.src" value="${basedir}/src/avro"/>
<property name="build.src.gen-java" value="${basedir}/src/gen-java"/>
<property name="build.lib" value="${basedir}/lib"/>
@@ -60,11 +59,9 @@
<property name="test.data" value="${test.dir}/data"/>
<property name="test.name" value="*Test"/>
<property name="test.unit.src" value="${test.dir}/unit"/>
- <property name="test.src.driver" value="${basedir}/drivers/java/test"/>
<property name="test.long.src" value="${test.dir}/long"/>
<property name="test.distributed.src" value="${test.dir}/distributed"/>
<property name="dist.dir" value="${build.dir}/dist"/>
- <property name="cql.driver.version" value="1.0.4" />
<condition property="version" value="${base.version}">
<isset property="release"/>
</condition>
@@ -698,11 +695,6 @@ url=${svn.entry.url}?pathrev=${svn.entry
<src path="${build.src.gen-java}"/>
<classpath refid="cassandra.classpath"/>
</javac>
- <javac debug="true" debuglevel="${debuglevel}"
- destdir="${build.classes.cql}" includeantruntime="false">
- <src path="${build.src.driver}" />
- <classpath refid="cassandra.classpath"/>
- </javac>
<copy todir="${build.classes.main}">
<fileset dir="${build.src.resources}" />
</copy>
@@ -779,20 +771,6 @@ url=${svn.entry.url}?pathrev=${svn.entry
<attribute name="Implementation-Vendor" value="Apache"/>
</manifest>
</jar>
-
- <!-- CQL driver Jar -->
- <artifact:writepom pomRefId="cql-pom"
- file="${build.dir}/${ant.project.name}-cql-${cql.driver.version}.pom"/>
- <jar jarfile="${build.dir}/${ant.project.name}-cql-${cql.driver.version}.jar"
- basedir="${build.classes.cql}">
- <manifest>
- <attribute name="Implementation-Title" value="Cassandra"/>
- <attribute name="Implementation-Version" value="${version}"/>
- <attribute name="Implementation-Vendor" value="Apache"/>
- <attribute name="Class-Path"
- value="${ant.project.name}-thrift-${version}.jar" />
- </manifest>
- </jar>
</target>
<!--
@@ -818,23 +796,11 @@ url=${svn.entry.url}?pathrev=${svn.entry
<fileset dir="${build.src.gen-java}" defaultexcludes="yes">
<include name="org/apache/**/*.java"/>
</fileset>
- <fileset dir="${build.src.driver}" defaultexcludes="yes">
- <include name="org/apache/**/*.java"/>
- </fileset>
</filesets>
</create-javadoc>
<jar jarfile="${build.dir}/${final.name}-javadoc.jar"
basedir="${javadoc.jars.dir}/main"/>
- <create-javadoc destdir="${javadoc.jars.dir}/cql">
- <filesets>
- <fileset dir="${build.src.driver}" defaultexcludes="yes">
- <include name="org/apache/**/*.java"/>
- </fileset>
- </filesets>
- </create-javadoc>
- <jar jarfile="${build.dir}/${ant.project.name}-cql-${cql.driver.version}-javadoc.jar"
- basedir="${javadoc.jars.dir}/cql"/>
<!-- javadoc task always rebuilds so might as well remove the generated docs to prevent
being pulled into the distribution by accident -->
<delete quiet="true" dir="${javadoc.jars.dir}"/>
@@ -856,19 +822,11 @@ url=${svn.entry.url}?pathrev=${svn.entry
<fileset dir="${build.src.gen-java}" defaultexcludes="yes">
<include name="org/apache/**/*.java"/>
</fileset>
- <fileset dir="${build.src.driver}" defaultexcludes="yes">
- <include name="org/apache/**/*.java"/>
- </fileset>
- </jar>
- <jar jarfile="${build.dir}/${ant.project.name}-cql-${cql.driver.version}-sources.jar">
- <fileset dir="${build.src.driver}" defaultexcludes="yes">
- <include name="org/apache/**/*.java"/>
- </fileset>
</jar>
</target>
<!-- creates release tarballs -->
- <target name="artifacts" depends="jar,javadoc,py-cql-driver"
+ <target name="artifacts" depends="jar,javadoc"
description="Create Cassandra release artifacts">
<mkdir dir="${dist.dir}"/>
<copy todir="${dist.dir}/lib">
@@ -958,14 +916,12 @@ url=${svn.entry.url}?pathrev=${svn.entry
algorithm="MD5">
<fileset dir="${build.dir}">
<include name="*.tar.gz" />
- <include name="${ant.project.name}-cql-${cql.driver.version}.jar" />
</fileset>
</checksum>
<checksum forceOverwrite="yes" todir="${build.dir}" fileext=".sha"
algorithm="SHA">
<fileset dir="${build.dir}">
<include name="*.tar.gz" />
- <include name="${ant.project.name}-cql-${cql.driver.version}.jar" />
</fileset>
</checksum>
@@ -999,7 +955,6 @@ url=${svn.entry.url}?pathrev=${svn.entry
</classpath>
<src path="${test.unit.src}"/>
<src path="${test.long.src}"/>
- <src path="${test.src.driver}"/>
</javac>
<!-- Non-java resources needed by the test suite -->
@@ -1077,9 +1032,6 @@ url=${svn.entry.url}?pathrev=${svn.entry
<jvmarg value="-Dlegacy-sstable-root=${test.data}/legacy-sstables"/>
<jvmarg value="-Dcorrupt-sstable-root=${test.data}/corrupt-sstables"/>
</testmacro>
- <testmacro suitename="driverunit" inputdir="${test.src.driver}" timeout="60000">
- <jvmarg value="-Dlegacy-sstable-root=${test.data}/legacy-sstables"/>
- </testmacro>
</target>
<target name="test-compression" depends="build-test" description="Execute unit tests with sstable compression enabled">
@@ -1234,8 +1186,6 @@ url=${svn.entry.url}?pathrev=${svn.entry
<classpathentry kind="src" path="src/java"/>
<classpathentry kind="src" path="src/gen-java"/>
<classpathentry kind="src" path="interface/thrift/gen-java"/>
- <classpathentry kind="src" path="drivers/java/src"/>
- <classpathentry kind="src" path="drivers/java/test"/>
<classpathentry kind="src" path="test/unit"/>
<classpathentry kind="src" path="test/long"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
@@ -1313,17 +1263,6 @@ url=${svn.entry.url}?pathrev=${svn.entry
<delete dir="build/eclipse-classes" />
</target>
- <target name="py-cql-driver"
- description="Generate Python CQL driver artifact">
- <echo>Creating Python CQL driver artifact...</echo>
- <exec executable="python" dir="${basedir}/drivers/py" failonerror="true">
- <arg line="setup.py" />
- <arg line="sdist" />
- <arg line="--dist-dir" />
- <arg line="${build.dir}" />
- </exec>
- </target>
-
<!-- Publish artifacts to Maven repositories -->
<target name="mvn-install"
depends="maven-declare-dependencies,artifacts,jar,sources-jar,javadoc-jar"
@@ -1347,7 +1286,7 @@ url=${svn.entry.url}?pathrev=${svn.entry
packaging="tar.gz"
classifier="src"/>
- <!-- the cassandra-thrift jar -->
+ <!-- the cassandr-thrift jar -->
<install pomFile="${build.dir}/${ant.project.name}-thrift-${version}.pom"
file="${build.dir}/${ant.project.name}-thrift-${version}.jar"/>
<install pomFile="${build.dir}/${ant.project.name}-thrift-${version}.pom"
@@ -1366,16 +1305,6 @@ url=${svn.entry.url}?pathrev=${svn.entry
<install pomFile="${build.dir}/${final.name}.pom"
file="${build.dir}/${final.name}-javadoc.jar"
classifier="javadoc"/>
-
- <!-- the cassandra-cql jar -->
- <install pomFile="${build.dir}/${ant.project.name}-cql-${cql.driver.version}.pom"
- file="${build.dir}/${ant.project.name}-cql-${cql.driver.version}.jar"/>
- <install pomFile="${build.dir}/${ant.project.name}-cql-${cql.driver.version}.pom"
- file="${build.dir}/${ant.project.name}-cql-${cql.driver.version}-sources.jar"
- classifier="sources"/>
- <install pomFile="${build.dir}/${ant.project.name}-cql-${cql.driver.version}.pom"
- file="${build.dir}/${ant.project.name}-cql-${cql.driver.version}-javadoc.jar"
- classifier="javadoc"/>
</target>
<target name="publish"
@@ -1420,16 +1349,6 @@ url=${svn.entry.url}?pathrev=${svn.entry
<deploy pomFile="${build.dir}/${final.name}.pom"
file="${build.dir}/${final.name}-javadoc.jar"
classifier="javadoc"/>
-
- <!-- the cassandra-cql jar -->
- <deploy pomFile="${build.dir}/${ant.project.name}-cql-${cql.driver.version}.pom"
- file="${build.dir}/${ant.project.name}-cql-${cql.driver.version}.jar"/>
- <deploy pomFile="${build.dir}/${ant.project.name}-cql-${cql.driver.version}.pom"
- file="${build.dir}/${ant.project.name}-cql-${cql.driver.version}-sources.jar"
- classifier="sources"/>
- <deploy pomFile="${build.dir}/${ant.project.name}-cql-${cql.driver.version}.pom"
- file="${build.dir}/${ant.project.name}-cql-${cql.driver.version}-javadoc.jar"
- classifier="javadoc"/>
</target>
</project>
Propchange: cassandra/branches/cassandra-1.0/contrib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 9 14:56:47 2011
@@ -5,7 +5,7 @@
/cassandra/branches/cassandra-0.8.0/contrib:1125021-1130369
/cassandra/branches/cassandra-0.8.1/contrib:1101014-1125018
/cassandra/branches/cassandra-1.0/contrib:1167106,1167185
-/cassandra/branches/cassandra-1.0.0/contrib:1167106,1167185
+/cassandra/branches/cassandra-1.0.0/contrib:1167106,1167185,1167230-1167231
/cassandra/tags/cassandra-0.7.0-rc3/contrib:1051699-1053689
/cassandra/tags/cassandra-0.8.0-rc1/contrib:1102511-1125020
/incubator/cassandra/branches/cassandra-0.3/contrib:774578-796573
Propchange: cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 9 14:56:47 2011
@@ -5,7 +5,7 @@
/cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1125021-1130369
/cassandra/branches/cassandra-0.8.1/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1101014-1125018
/cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1167106,1167185
-/cassandra/branches/cassandra-1.0.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1167106,1167185
+/cassandra/branches/cassandra-1.0.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1167106,1167185,1167230-1167231
/cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1051699-1053689
/cassandra/tags/cassandra-0.8.0-rc1/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1102511-1125020
/incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/Cassandra.java:774578-796573
Propchange: cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 9 14:56:47 2011
@@ -5,7 +5,7 @@
/cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1125021-1130369
/cassandra/branches/cassandra-0.8.1/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1101014-1125018
/cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1167106,1167185
-/cassandra/branches/cassandra-1.0.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1167106,1167185
+/cassandra/branches/cassandra-1.0.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1167106,1167185,1167230-1167231
/cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1051699-1053689
/cassandra/tags/cassandra-0.8.0-rc1/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1102511-1125020
/incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/column_t.java:774578-792198
Propchange: cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 9 14:56:47 2011
@@ -5,7 +5,7 @@
/cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1125021-1130369
/cassandra/branches/cassandra-0.8.1/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1101014-1125018
/cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1167106,1167185
-/cassandra/branches/cassandra-1.0.0/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1167106,1167185
+/cassandra/branches/cassandra-1.0.0/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1167106,1167185,1167230-1167231
/cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1051699-1053689
/cassandra/tags/cassandra-0.8.0-rc1/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1102511-1125020
/incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java:774578-796573
Propchange: cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 9 14:56:47 2011
@@ -5,7 +5,7 @@
/cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1125021-1130369
/cassandra/branches/cassandra-0.8.1/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1101014-1125018
/cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1167106,1167185
-/cassandra/branches/cassandra-1.0.0/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1167106,1167185
+/cassandra/branches/cassandra-1.0.0/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1167106,1167185,1167230-1167231
/cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1051699-1053689
/cassandra/tags/cassandra-0.8.0-rc1/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1102511-1125020
/incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/NotFoundException.java:774578-796573
Propchange: cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 9 14:56:47 2011
@@ -5,7 +5,7 @@
/cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1125021-1130369
/cassandra/branches/cassandra-0.8.1/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1101014-1125018
/cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1167106,1167185
-/cassandra/branches/cassandra-1.0.0/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1167106,1167185
+/cassandra/branches/cassandra-1.0.0/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1167106,1167185,1167230-1167231
/cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1051699-1053689
/cassandra/tags/cassandra-0.8.0-rc1/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1102511-1125020
/incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/superColumn_t.java:774578-792198