Author: markt
Date: Mon Nov 12 10:16:31 2018
New Revision: 1846389
URL: http://svn.apache.org/viewvc?rev=1846389&view=rev
Log:
Move storage location to a dir that is ignored by svn/git
Modified:
tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Constants.java
tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Export.java
tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Import.java
Modified: tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Constants.java?rev=1846389&r1=1846388&r2=1846389&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Constants.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Constants.java Mon
Nov 12 10:16:31 2018
@@ -23,5 +23,7 @@ public class Constants {
public static final String[] SEARCH_DIRS = new String[] { "java",
"webapps" };
+ public static final String STORAGE_DIR = ".settings/translations";
+
public static final String END_PACKAGE_MARKER = ".zzz.";
}
Modified: tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Export.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Export.java?rev=1846389&r1=1846388&r2=1846389&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Export.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Export.java Mon Nov
12 10:16:31 2018
@@ -110,6 +110,12 @@ public class Export {
private static void outputTranslations() {
+
+ File storageDir = new File(Constants.STORAGE_DIR);
+ if (!storageDir.exists()) {
+ storageDir.mkdirs();
+ }
+
for (Map.Entry<String,Properties> translationEntry :
translations.entrySet()) {
Properties translation = translationEntry.getValue();
@@ -118,7 +124,7 @@ public class Export {
language = "_" + language;
}
- File out = new File(Constants.L10N_PREFIX + language +
Constants.L10N_SUFFIX);
+ File out = new File(storageDir, Constants.L10N_PREFIX + language +
Constants.L10N_SUFFIX);
try (FileOutputStream fos = new FileOutputStream(out);
Writer w = new OutputStreamWriter(fos,
StandardCharsets.UTF_8)) {
for (Object key : translation.keySet()) {
Modified: tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Import.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Import.java?rev=1846389&r1=1846388&r2=1846389&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Import.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Import.java Mon Nov
12 10:16:31 2018
@@ -28,7 +28,7 @@ import java.util.Properties;
public class Import {
public static void main(String... args) throws IOException {
- File root = new File(".");
+ File root = new File(Constants.STORAGE_DIR);
for (File f : root.listFiles()) {
// Not robust but good enough
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
