Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

revert thrift upgradation and jdk7 compiler issues

  • Loading branch information...
commit 390f9a5558f2bbc3a034065ad083a3a897a56d57 2 parents 0bdf2ae + cd005df
Karthik K akkumar authored
2  .classpath
View
@@ -48,9 +48,9 @@
<classpathentry kind="lib" path="lib/jna.jar"/>
<classpathentry kind="lib" path="lib/mockito-all-1.8.5.jar"/>
<classpathentry kind="lib" path="lib/avro-1.4.0.jar"/>
+ <classpathentry kind="lib" path="lib/libthrift-0.5.0.jar"/>
<classpathentry kind="lib" path="lib/compress-lzf-0.9.1.jar"/>
<classpathentry kind="lib" path="lib/snappy-0.2.jar"/>
- <classpathentry kind="lib" path="lib/libthrift-0.8.0.jar"/>
<classpathentry kind="lib" path="lib/httpclient-4.1.2.jar" />
<classpathentry kind="lib" path="lib/httpcore-4.1.2.jar" />
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
10 build.properties
View
@@ -1,11 +1,4 @@
-## Main source
-
-
-# Directory that points to the JRE folder to bootstrap.
-# See: http://blogs.oracle.com/darcy/entry/bootclasspath_older_source
-# Eg: /usr/local/jdk1.6.0_30/jre, say , that contains the rt.jar for the distribution.
-java5.home=${java.home}
-
+## Main source
src.dir=src
java.dir=src/java
python.dir=clients/python
@@ -42,4 +35,3 @@ tomcat.context=/voldemort
## Release
curr.release=0.90.1
-
17 build.xml
View
@@ -15,13 +15,6 @@
<pathelement path="${classes.dir}" />
</path>
- <path id="bootref-classpath">
- <fileset dir="${java5.home}/lib">
- <include name="rt.jar" />
- </fileset>
- </path>
-
-
<!-- set the build number based on environment variable, otherwise blank -->
<property environment="env" description="System environment variables (including those set by Hudson)"/>
<condition property="curr.release.snapshot" value="${curr.release}-snapshot-${env.BUILD_NUMBER}" else="${curr.release}">
@@ -86,10 +79,9 @@
<!-- place to put log4j.properties -->
<replace-dir dir="${resources.dir}"/>
<copy file="${java.dir}/log4j.properties" todir="${resources.dir}"/>
- <javac destdir="${classes.dir}" source="1.5" target="1.5" debug="true" deprecation="false" failonerror="true" includeantruntime="false">
+ <javac destdir="${classes.dir}" target="1.5" debug="true" deprecation="false" failonerror="true" includeantruntime="false">
<src path="${java.dir}" />
<classpath refid="main-classpath" />
- <bootclasspath refid="bootref-classpath" />
</javac>
</target>
@@ -107,12 +99,11 @@
<exclude name="**/*.html" />
</fileset>
</copy>
- <javac destdir="${testclasses.dir}" source="1.5" target="1.5" debug="true" deprecation="false" failonerror="true" includeantruntime="false">
+ <javac destdir="${testclasses.dir}" target="1.5" debug="true" deprecation="false" failonerror="true" includeantruntime="false">
<src path="${unittestsrc.dir}" />
<src path="${inttestsrc.dir}" />
<src path="${commontestsrc.dir}" />
<classpath refid="main-classpath" />
- <bootclasspath refid="bootref-classpath" />
</javac>
</target>
@@ -188,7 +179,7 @@
<target name="contrib-build" depends="build, buildtest" description="Compile contrib packages (java and test) ">
<replace-dir dir="${contrib.classes.dir}" />
- <javac destdir="${contrib.classes.dir}" source="1.5" target="1.5" debug="true" deprecation="false" failonerror="true" includeantruntime="false">
+ <javac destdir="${contrib.classes.dir}" target="1.5" debug="true" deprecation="false" failonerror="true" includeantruntime="false">
<src path="${contrib.root.dir}" />
<src path="${contrib.root.dir}" />
<classpath refid="main-classpath" />
@@ -395,7 +386,7 @@
<report todir="${testhtml.dir}" format="frames" />
</junitreport>
</target>
-
+
<target name="junit-test" depends="build, buildtest, contrib-jar" description="Run single junit test with -Dtest.name=">
<junit printsummary="yes" showoutput="true" maxmemory="1024m">
<classpath refid="contrib-test-classpath" />
BIN  lib/libthrift-0.5.0.jar
View
Binary file not shown
BIN  lib/libthrift-0.8.0.jar
View
Binary file not shown
Please sign in to comment.
Something went wrong with that request. Please try again.