Author: lewismc Date: Fri Jun 8 13:56:20 2012 New Revision: 1348074 URL: http://svn.apache.org/viewvc?rev=1348074&view=rev Log: trivial commit prior to RC#1
Modified: nutch/branches/nutchgora/CHANGES.txt nutch/branches/nutchgora/build.xml nutch/branches/nutchgora/conf/schema.xml Modified: nutch/branches/nutchgora/CHANGES.txt URL: http://svn.apache.org/viewvc/nutch/branches/nutchgora/CHANGES.txt?rev=1348074&r1=1348073&r2=1348074&view=diff ============================================================================== --- nutch/branches/nutchgora/CHANGES.txt (original) +++ nutch/branches/nutchgora/CHANGES.txt Fri Jun 8 13:56:20 2012 @@ -1,6 +1,7 @@ Nutch Change Log -Release 2.1 (22/02/2012) +Release 2.0 (08/06/2012) ddmmyyy +Full Jira report - https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=10680&version=12314893 * NUTCH-1379 NPE when reprUrl is null in ParseUtil (ferdy) Modified: nutch/branches/nutchgora/build.xml URL: http://svn.apache.org/viewvc/nutch/branches/nutchgora/build.xml?rev=1348074&r1=1348073&r2=1348074&view=diff ============================================================================== --- nutch/branches/nutchgora/build.xml (original) +++ nutch/branches/nutchgora/build.xml Fri Jun 8 13:56:20 2012 @@ -608,7 +608,6 @@ <mkdir dir="${dist.dir}"/> <mkdir dir="${src.dist.version.dir}"/> <mkdir dir="${src.dist.version.dir}/lib"/> - <mkdir dir="${src.dist.version.dir}/runtime"/> <mkdir dir="${src.dist.version.dir}/docs"/> <mkdir dir="${src.dist.version.dir}/docs/api"/> <mkdir dir="${src.dist.version.dir}/ivy"/> @@ -616,15 +615,6 @@ <copy todir="${src.dist.version.dir}/lib" includeEmptyDirs="false"> <fileset dir="lib"/> </copy> - - <copy todir="${src.dist.version.dir}/runtime"> - <fileset dir="runtime"/> - </copy> - - <chmod perm="ugo+x" type="file"> - <fileset dir="${src.dist.version.dir}/runtime/deploy/bin"/> - <fileset dir="${src.dist.version.dir}/runtime/local/bin"/> - </chmod> <copy todir="${src.dist.version.dir}/conf"> <fileset dir="${conf.dir}" excludes="**/*.template"/> @@ -704,6 +694,7 @@ destfile="${src.dist.version.dir}.tar.gz" basedir="${src.dist.version.dir}"> <tarfileset dir="${dist.dir}" mode="664"> <exclude name="${src.dist.version.dir}/bin/*" /> + <exclude name="${src.dist.version.dir}/runtime/*" /> <include name="${src.dist.version.dir}/**" /> </tarfileset> <tarfileset dir="${dist.dir}" mode="755"> @@ -736,6 +727,7 @@ destfile="${src.dist.version.dir}.zip" basedir="${src.dist.version.dir}"> <zipfileset dir="${dist.dir}" filemode="664"> <exclude name="${src.dist.version.dir}/bin/*" /> + <exclude name="${src.dist.version.dir}/runtime/*" /> <include name="${src.dist.version.dir}/**" /> </zipfileset> <zipfileset dir="${dist.dir}" filemode="755"> Modified: nutch/branches/nutchgora/conf/schema.xml URL: http://svn.apache.org/viewvc/nutch/branches/nutchgora/conf/schema.xml?rev=1348074&r1=1348073&r2=1348074&view=diff ============================================================================== --- nutch/branches/nutchgora/conf/schema.xml (original) +++ nutch/branches/nutchgora/conf/schema.xml Fri Jun 8 13:56:20 2012 @@ -27,7 +27,7 @@ example/solr/conf/schema.xml?view=markup for more info. --> -<schema name="nutch" version="1.4"> +<schema name="nutch" version="2.0"> <types> <fieldType name="string" class="solr.StrField" sortMissingLast="true" omitNorms="true"/>