zookeeper-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject svn commit: r1683043 - in /zookeeper/branches/branch-3.5: ./ src/contrib/ src/contrib/rest/ src/contrib/zooinspector/ src/recipes/ src/recipes/election/ src/recipes/lock/ src/recipes/queue/
Date Tue, 02 Jun 2015 05:23:40 GMT
Author: rgs
Date: Tue Jun  2 05:23:40 2015
New Revision: 1683043

URL: http://svn.apache.org/r1683043
Log:
ZOOKEEPER-2197 non-ascii character in FinalRequestProcessor.java

To be able to use utf-8 in .java source files we now use utf-8
encoding to build them (Michi Mutsuzaki via rgs).

Modified:
    zookeeper/branches/branch-3.5/CHANGES.txt
    zookeeper/branches/branch-3.5/build.xml
    zookeeper/branches/branch-3.5/src/contrib/build-contrib.xml
    zookeeper/branches/branch-3.5/src/contrib/rest/build.xml
    zookeeper/branches/branch-3.5/src/contrib/zooinspector/build.xml
    zookeeper/branches/branch-3.5/src/recipes/build-recipes.xml
    zookeeper/branches/branch-3.5/src/recipes/election/build.xml
    zookeeper/branches/branch-3.5/src/recipes/lock/build.xml
    zookeeper/branches/branch-3.5/src/recipes/queue/build.xml

Modified: zookeeper/branches/branch-3.5/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/CHANGES.txt?rev=1683043&r1=1683042&r2=1683043&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.5/CHANGES.txt Tue Jun  2 05:23:40 2015
@@ -105,6 +105,9 @@ BUGFIXES:
 
   ZOOKEEPER-2178 Native client fails compilation on Windows. (Chris Nauroth via michim)
 
+  ZOOKEEPER-2197 non-ascii character in FinalRequestProcessor.java
+  (Michi Mutsuzaki via rgs)
+
 IMPROVEMENTS:
   ZOOKEEPER-1660 Documentation for Dynamic Reconfiguration (Reed Wanderman-Milne via shralex)
 

Modified: zookeeper/branches/branch-3.5/build.xml
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/build.xml?rev=1683043&r1=1683042&r2=1683043&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/build.xml (original)
+++ zookeeper/branches/branch-3.5/build.xml Tue Jun  2 05:23:40 2015
@@ -41,6 +41,7 @@ xmlns:maven="antlib:org.apache.maven.art
     
     <property name="javac.target" value="1.7" />
     <property name="javac.source" value="1.7" />
+    <property name="build.encoding" value="utf8" />
 
     <property name="src.dir" value="${basedir}/src" />
     <property name="java.src.dir" value="${src.dir}/java/main" />
@@ -284,8 +285,7 @@ xmlns:maven="antlib:org.apache.maven.art
     <target name="jute" depends="generate_jute_parser">
         <javac srcdir="${jute_javacc.dir}" destdir="${build.classes}" includeantruntime="false"
             target="${javac.target}" source="${javac.source}"
-            includes="org/apache/jute/**" debug="on" 
-        >
+            includes="org/apache/jute/**" debug="on" encoding="${build.encoding}">
           <src path="${java.src.dir}" />
           <src path="${jute_javacc.dir}" />
         </javac>
@@ -325,7 +325,7 @@ xmlns:maven="antlib:org.apache.maven.art
     <target name="ver-gen" depends="init">
         <javac srcdir="${java.src.dir}" destdir="${build.classes}" includeantruntime="false"
             target="${javac.target}" source="${javac.source}"
-            includes="org/apache/zookeeper/version/util/**" debug="on" />
+            includes="org/apache/zookeeper/version/util/**" debug="on" encoding="${build.encoding}"
/>
     </target>
     
     <target name="svn-revision" unless="lastRevision">
@@ -358,7 +358,7 @@ xmlns:maven="antlib:org.apache.maven.art
     
     <target name="build-generated" depends="compile_jute,version-info,process-template"
>
         <javac srcdir="${src_generated.dir}" destdir="${build.classes}" includeantruntime="false"
-            target="${javac.target}" source="${javac.source}" debug="on" />
+            target="${javac.target}" source="${javac.source}" debug="on" encoding="${build.encoding}"
/>
     </target>
     
     <target name="ivy-download" unless="ivy.jar.exists" depends="init">
@@ -431,7 +431,7 @@ xmlns:maven="antlib:org.apache.maven.art
     </target>
     <target name="compile" depends="ivy-retrieve,clover,build-generated">
         <javac srcdir="${java.src.dir}" destdir="${build.classes}" includeantruntime="false"
-               target="${javac.target}" source="${javac.source}" debug="on">
+               target="${javac.target}" source="${javac.source}" debug="on" encoding="${build.encoding}">
             <classpath refid="java.classpath"/>
             <compilerarg value="-Xlint:all"/>
             <compilerarg value="-Xlint:-path"/>
@@ -441,11 +441,11 @@ xmlns:maven="antlib:org.apache.maven.art
     <target name="compile-test" depends="ivy-retrieve-test,compile">
       <mkdir dir="${test.java.classes}"/>
       <javac srcdir="${test.src.dir}" destdir="${test.java.classes}" includeantruntime="false"
-             target="${javac.target}" source="${javac.source}" debug="on">
+             target="${javac.target}" source="${javac.source}" debug="on" encoding="${build.encoding}">
         <classpath refid="test.java.classpath"/>
       </javac>
       <javac srcdir="${systest.src.dir}" destdir="${test.java.classes}" includeantruntime="false"
-             target="${javac.target}" source="${javac.source}" debug="on">
+             target="${javac.target}" source="${javac.source}" debug="on" encoding="${build.encoding}">
         <classpath refid="test.java.classpath"/>
       </javac>
     </target>

Modified: zookeeper/branches/branch-3.5/src/contrib/build-contrib.xml
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/src/contrib/build-contrib.xml?rev=1683043&r1=1683042&r2=1683043&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/src/contrib/build-contrib.xml (original)
+++ zookeeper/branches/branch-3.5/src/contrib/build-contrib.xml Tue Jun  2 05:23:40 2015
@@ -39,7 +39,7 @@
   <property name="javac.deprecation" value="on"/>
   <property name="javac.debug" value="on"/>
 
-  <property name="build.encoding" value="ISO-8859-1"/>
+  <property name="build.encoding" value="utf8"/>
 
   <property name="ivy.version" value="2.2.0"/>
   <property name="ivy.url"

Modified: zookeeper/branches/branch-3.5/src/contrib/rest/build.xml
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/src/contrib/rest/build.xml?rev=1683043&r1=1683042&r2=1683043&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/src/contrib/rest/build.xml (original)
+++ zookeeper/branches/branch-3.5/src/contrib/rest/build.xml Tue Jun  2 05:23:40 2015
@@ -81,7 +81,7 @@
 		<javac srcdir="${src.test.local}" 
 			destdir="${build.test}" 
 			target="${target.jdk}" 
-			debug="on" >
+			debug="on" encoding="${build.encoding}">
 			<classpath refid="classpath" />
 		</javac>
 	</target>

Modified: zookeeper/branches/branch-3.5/src/contrib/zooinspector/build.xml
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/src/contrib/zooinspector/build.xml?rev=1683043&r1=1683042&r2=1683043&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/src/contrib/zooinspector/build.xml (original)
+++ zookeeper/branches/branch-3.5/src/contrib/zooinspector/build.xml Tue Jun  2 05:23:40 2015
@@ -76,7 +76,7 @@
 		<property name="target.jdk" value="${ant.java.version}" />
 		<property name="src.test.local" location="${basedir}/test" />
 		<mkdir dir="${build.test}" />
-		<javac srcdir="${src.test.local}" destdir="${build.test}" target="${target.jdk}" debug="on">
+		<javac srcdir="${src.test.local}" destdir="${build.test}" target="${target.jdk}" debug="on"
encoding="${build.encoding}">
 			<classpath refid="classpath" />
 			<classpath>
 				<pathelement location="${zk.root}/build/test/classes" />

Modified: zookeeper/branches/branch-3.5/src/recipes/build-recipes.xml
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/src/recipes/build-recipes.xml?rev=1683043&r1=1683042&r2=1683043&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/src/recipes/build-recipes.xml (original)
+++ zookeeper/branches/branch-3.5/src/recipes/build-recipes.xml Tue Jun  2 05:23:40 2015
@@ -36,7 +36,7 @@
   <property name="javac.deprecation" value="on"/>
   <property name="javac.debug" value="on"/>
 
-  <property name="build.encoding" value="ISO-8859-1"/>
+  <property name="build.encoding" value="utf8"/>
 
   <!-- to be overridden by sub-projects -->
   <target name="check-recipes"/>

Modified: zookeeper/branches/branch-3.5/src/recipes/election/build.xml
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/src/recipes/election/build.xml?rev=1683043&r1=1683042&r2=1683043&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/src/recipes/election/build.xml (original)
+++ zookeeper/branches/branch-3.5/src/recipes/election/build.xml Tue Jun  2 05:23:40 2015
@@ -57,7 +57,7 @@
 		<javac srcdir="${src.test.local}" 
 			destdir="${build.test}" 
 			target="${target.jdk}" 
-			debug="on" >
+			debug="on" encoding="${build.encoding}">
 			<classpath refid="classpath" />
                         <classpath>
                         <pathelement path="${test.main.classes}"/>

Modified: zookeeper/branches/branch-3.5/src/recipes/lock/build.xml
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/src/recipes/lock/build.xml?rev=1683043&r1=1683042&r2=1683043&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/src/recipes/lock/build.xml (original)
+++ zookeeper/branches/branch-3.5/src/recipes/lock/build.xml Tue Jun  2 05:23:40 2015
@@ -57,7 +57,7 @@
 		<javac srcdir="${src.test.local}" 
 			destdir="${build.test}" 
 			target="${target.jdk}" 
-			debug="on" >
+			debug="on" encoding="${build.encoding}">
 			<classpath refid="classpath" />
                         <classpath>
                         <pathelement path="${test.main.classes}"/>

Modified: zookeeper/branches/branch-3.5/src/recipes/queue/build.xml
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/src/recipes/queue/build.xml?rev=1683043&r1=1683042&r2=1683043&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/src/recipes/queue/build.xml (original)
+++ zookeeper/branches/branch-3.5/src/recipes/queue/build.xml Tue Jun  2 05:23:40 2015
@@ -57,7 +57,7 @@
 		<javac srcdir="${src.test.local}" 
 			destdir="${build.test}" 
 			target="${target.jdk}" 
-			debug="on" >
+			debug="on" encoding="${build.encoding}">
 			<classpath refid="classpath" />
                         <classpath>
                         <pathelement path="${test.main.classes}"/>



Mime
View raw message