Updated Branches: refs/heads/cassandra-1.0 02346a1e6 -> 8703f745f
-javadoc and -sources jars for clientutil Patch by satish babu krishnamoorthy w/ minor changes; reviewed by eevans for CASSANDRA-3426 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8703f745 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8703f745 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8703f745 Branch: refs/heads/cassandra-1.0 Commit: 8703f745fede8705d8e186c0bf6e91a32159701c Parents: 02346a1 Author: Eric Evans <eev...@apache.org> Authored: Thu Dec 29 15:33:45 2011 -0600 Committer: Eric Evans <eev...@apache.org> Committed: Thu Dec 29 16:38:24 2011 -0600 ---------------------------------------------------------------------- build.xml | 46 ++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 38 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8703f745/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 70aa7e5..0cb7f9e 100644 --- a/build.xml +++ b/build.xml @@ -790,17 +790,29 @@ url=${svn.entry.url}?pathrev=${svn.entry.commit.revision} <create-javadoc destdir="${javadoc.jars.dir}/main"> <filesets> - <fileset dir="${build.src.java}" defaultexcludes="yes"> - <include name="org/apache/**/*.java"/> - </fileset> - <fileset dir="${build.src.gen-java}" defaultexcludes="yes"> - <include name="org/apache/**/*.java"/> - </fileset> + <fileset dir="${build.src.java}" defaultexcludes="yes"> + <include name="org/apache/**/*.java"/> + </fileset> + <fileset dir="${build.src.gen-java}" 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}/clientutil"> + <filesets> + <fileset dir="${build.src.java}" defaultexcludes="yes"> + <include name="org/apache/cassandra/cql/jdbc/*" /> + <include name="org/apache/cassandra/utils/ByteBufferUtil*.java" /> + <include name="org/apache/cassandra/utils/Hex.java" /> + <include name="org/apache/cassandra/utils/UUIDGen*.java" /> + </fileset> + </filesets> + </create-javadoc> + <jar jarfile="${build.dir}/${ant.project.name}-clientutil-${version}-javadoc.jar" + basedir="${javadoc.jars.dir}/clientutil"/> <!-- 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}"/> @@ -823,6 +835,14 @@ url=${svn.entry.url}?pathrev=${svn.entry.commit.revision} <include name="org/apache/**/*.java"/> </fileset> </jar> + <jar jarfile="${build.dir}/${ant.project.name}-clientutil-${version}-sources.jar"> + <fileset dir="${build.src.java}" defaultexcludes="yes"> + <include name="org/apache/cassandra/cql/jdbc/*" /> + <include name="org/apache/cassandra/utils/ByteBufferUtil*.java" /> + <include name="org/apache/cassandra/utils/Hex.java" /> + <include name="org/apache/cassandra/utils/UUIDGen*.java" /> + </fileset> + </jar> </target> <!-- creates release tarballs --> @@ -1253,6 +1273,12 @@ url=${svn.entry.url}?pathrev=${svn.entry.commit.revision} <!-- the cassandra-clientutil jar --> <install pomFile="${build.dir}/${ant.project.name}-clientutil-${version}.pom" file="${build.dir}/${ant.project.name}-clientutil-${version}.jar"/> + <install pomFile="${build.dir}/${ant.project.name}-clientutil-${version}.pom" + file="${build.dir}/${ant.project.name}-clientutil-${version}-sources.jar" + classifier="sources"/> + <install pomFile="${build.dir}/${ant.project.name}-clientutil-${version}.pom" + file="${build.dir}/${ant.project.name}-clientutil-${version}-javadoc.jar" + classifier="javadoc"/> <!-- the cassandra-all jar --> <install pomFile="${build.dir}/${final.name}.pom" @@ -1301,7 +1327,12 @@ url=${svn.entry.url}?pathrev=${svn.entry.commit.revision} <!-- the cassandra-clientutil jar --> <deploy pomFile="${build.dir}/${ant.project.name}-clientutil-${version}.pom" file="${build.dir}/${ant.project.name}-clientutil-${version}.jar"/> - + <deploy pomFile="${build.dir}/${ant.project.name}-clientutil-${version}.pom" + file="${build.dir}/${ant.project.name}-clientutil-${version}-sources.jar" + classifier="sources"/> + <deploy pomFile="${build.dir}/${ant.project.name}-clientutil-${version}.pom" + file="${build.dir}/${ant.project.name}-clientutil-${version}-javadoc.jar" + classifier="javadoc"/> <!-- the cassandra-all jar --> <deploy pomFile="${build.dir}/${final.name}.pom" file="${build.dir}/${final.name}.jar"/> @@ -1312,5 +1343,4 @@ url=${svn.entry.url}?pathrev=${svn.entry.commit.revision} file="${build.dir}/${final.name}-javadoc.jar" classifier="javadoc"/> </target> - </project>
