From 309dd8191dcf25acd441afc099070f7a6325b76a Mon Sep 17 00:00:00 2001
From: Shawn Heisey <elyograg@apache.org>
Date: Thu, 6 Jun 2013 21:32:53 +0000
Subject: [PATCH] LUCENE-5043: autogenerate eclipse project name

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1490450 13f79535-47bb-0310-9956-ffa450edef68
---
 build.xml                     | 9 +++++++--
 dev-tools/eclipse/dot.project | 2 +-
 lucene/CHANGES.txt            | 4 ++++
 lucene/common-build.xml       | 4 ++--
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/build.xml b/build.xml
index eac26db9923..fb107be4833 100644
--- a/build.xml
+++ b/build.xml
@@ -130,7 +130,7 @@
   
   <target name="get-maven-poms"
           description="Copy Maven POMs from dev-tools/maven/ to maven-build/">
-    <copy todir="${maven-build-dir}" overwrite="true">
+    <copy todir="${maven-build-dir}" overwrite="true" encoding="UTF-8">
       <fileset dir="${basedir}/dev-tools/maven"/>
       <filterset begintoken="@" endtoken="@">
         <filter token="version" value="${version}"/>
@@ -185,7 +185,12 @@
   </target>
 
   <target name="eclipse" depends="resolve" description="Setup Eclipse configuration">
-    <copy file="dev-tools/eclipse/dot.project" tofile=".project" overwrite="false"/>
+    <basename file="${basedir}" property="eclipseprojectname"/>
+      <copy file="dev-tools/eclipse/dot.project" tofile=".project" overwrite="false" encoding="UTF-8">
+      <filterset>
+        <filter token="ECLIPSEPROJECTNAME" value="${eclipseprojectname}"/>
+      </filterset>
+    </copy>
     <mkdir dir=".settings"/>
     <copy todir=".settings/" overwrite="true">
       <fileset dir="dev-tools/eclipse/dot.settings" includes="*.prefs" />
diff --git a/dev-tools/eclipse/dot.project b/dev-tools/eclipse/dot.project
index e10343d3642..dcd7970c681 100644
--- a/dev-tools/eclipse/dot.project
+++ b/dev-tools/eclipse/dot.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>lucene_solr_trunk</name>
+	<name>@ECLIPSEPROJECTNAME@</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 25636ff87db..d274658c5fd 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -194,6 +194,10 @@ Build
   Test framework may fail internally due to overly aggresive J9 optimizations. 
   (Dawid Weiss, Shai Erera)
 
+* LUCENE-5043: The eclipse target now uses the containing directory for the
+  project name.  This also enforces UTF-8 encoding when files are copied with
+  filtering.
+
 Tests
 
 * LUCENE-4901: TestIndexWriterOnJRECrash should work on any 
diff --git a/lucene/common-build.xml b/lucene/common-build.xml
index 9a9d5251033..e08ee519f0b 100644
--- a/lucene/common-build.xml
+++ b/lucene/common-build.xml
@@ -1454,7 +1454,7 @@ ${tests-output}/junit4-*.suites     - per-JVM executed suites
 
   <target name="filter-pom-templates" unless="filtered.pom.templates.uptodate">
     <mkdir dir="${filtered.pom.templates.dir}"/>
-    <copy todir="${common.dir}/build/poms" overwrite="true">
+    <copy todir="${common.dir}/build/poms" overwrite="true" encoding="UTF-8">
       <fileset dir="${common.dir}/../dev-tools/maven"/>
       <filterset begintoken="@" endtoken="@">
         <filter token="version" value="${version}"/>
@@ -2030,7 +2030,7 @@ ${tests-output}/junit4-*.suites     - per-JVM executed suites
     <element name="nested" optional="false" implicit="true"/>
     <sequential>
       <copy todir="@{todir}" flatten="@{flatten}" overwrite="@{overwrite}" verbose="true"
-        preservelastmodified="false" encoding="UTF-8" outputencoding="UTF-8" taskname="pegdown"
+        preservelastmodified="false" encoding="UTF-8" taskname="pegdown"
       >
         <filterchain>
           <tokenfilter>