Author: daijy
Date: Thu Sep 16 00:28:36 2010
New Revision: 997551
URL: http://svn.apache.org/viewvc?rev=997551&view=rev
Log:
PIG-1608: pig should always include pig-default.properties and pig.properties
in the pig.jar
Modified:
hadoop/pig/trunk/CHANGES.txt
hadoop/pig/trunk/build.xml
Modified: hadoop/pig/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/pig/trunk/CHANGES.txt?rev=997551&r1=997550&r2=997551&view=diff
==============================================================================
--- hadoop/pig/trunk/CHANGES.txt (original)
+++ hadoop/pig/trunk/CHANGES.txt Thu Sep 16 00:28:36 2010
@@ -24,6 +24,8 @@ INCOMPATIBLE CHANGES
IMPROVEMENTS
+PIG-1608: pig should always include pig-default.properties and pig.properties
in the pig.jar (nrai via daijy)
+
OPTIMIZATIONS
BUG FIXES
Modified: hadoop/pig/trunk/build.xml
URL:
http://svn.apache.org/viewvc/hadoop/pig/trunk/build.xml?rev=997551&r1=997550&r2=997551&view=diff
==============================================================================
--- hadoop/pig/trunk/build.xml (original)
+++ hadoop/pig/trunk/build.xml Thu Sep 16 00:28:36 2010
@@ -466,6 +466,7 @@
<attribute name="Svn-Revision" value="${svnString}" />
</section>
</manifest>
+ <fileset file="${basedir}/conf/pig-default.properties" />
</jar>
<!-- @depricated -->
<jar jarfile="${output.jarfile}" basedir="${build.classes}">
@@ -491,6 +492,7 @@
<zipgroupfileset dir="${ivy.lib.dir}" includes="commons*.jar"/>
<zipgroupfileset dir="${ivy.lib.dir}" includes="log4j*.jar"/>
<zipgroupfileset dir="${ivy.lib.dir}" includes="jsp-api*.jar"/>
+ <fileset file="${basedir}/conf/pig-default.properties" />
</jar>
<copy file="${output.jarfile}" tofile="${output.jarfile.backcompat}"/>
</target>
@@ -528,6 +530,7 @@
<attribute name="Svn-Revision" value="${svnString}" />
</section>
</manifest>
+ <fileset file="${basedir}/conf/pig-default.properties" />
</jar>
<!-- @depricated -->
<jar jarfile="${output.jarfile.withouthadoop}"
basedir="${build.classes}">
@@ -547,6 +550,7 @@
<zipfileset
src="${ivy.lib.dir}/jackson-mapper-asl-${jackson.version}.jar" />
<zipfileset
src="${ivy.lib.dir}/jackson-core-asl-${jackson.version}.jar" />
<zipfileset
src="${ivy.lib.dir}/joda-time-${joda-time.version}.jar" />
+ <fileset file="${basedir}/conf/pig-default.properties" />
</jar>
<copy file="${output.jarfile.withouthadoop}"
tofile="${output.jarfile.backcompat.withouthadoop}"/>
</target>
@@ -703,7 +707,6 @@
<fileset dir="${build.docs}" />
</copy>
- <copy todir="${dist.dir}/conf"
file="conf/pig-default.properties"/>
<copy todir="${dist.dir}/conf" file="conf/pig.properties"/>
<copy todir="${dist.dir}/src" includeEmptyDirs="true">
