Reorganized property files and message bundle to reduce classpath con…

…flicts.
fumiX · Apr 16, 2021 · 0e9ef56 · 0e9ef56
1 parent 841501b
commit 0e9ef56
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 4 deletions.
diff --git a/lib/src/main/java/de/fumix/holidays/config/Config.java b/lib/src/main/java/de/fumix/holidays/config/Config.java
@@ -14,9 +14,9 @@ public class Config {
 	private static final Logger LOG = LoggerFactory.getLogger(Config.class);
 
 	// Resource paths to the configuration.
-	final static String HOLIDAY_PROPERTIES = "/holiday.properties";
-	final static String REGION_DE_PROPERTIES = "/region_DE.properties";
-	final static String REGION_AT_PROPERTIES = "/region_AT.properties";
+	final static String HOLIDAY_PROPERTIES = "/de/fumix/holidays/holiday.properties";
+	final static String REGION_DE_PROPERTIES = "/de/fumix/holidays/region_DE.properties";
+	final static String REGION_AT_PROPERTIES = "/de/fumix/holidays/region_AT.properties";
 
 
 	final LinkedHashMap<String, Holiday> holidays;
@@ -29,7 +29,7 @@ public Optional<Region> regionOf(String abbrev) {
 
 
 	public static ResourceBundle getHolidaysBundle(Locale locale) {
-		return ResourceBundle.getBundle("holidays.holidays");
+		return ResourceBundle.getBundle("de.fumix.holidays.messages");
 	}
 
 	public static Config fromResources() {

diff --git a/lib/src/main/resources/holiday.properties → ...rces/de/fumix/holidays/holiday.properties b/lib/src/main/resources/holiday.properties → ...rces/de/fumix/holidays/holiday.properties
diff --git a/...resources/holidays/holidays_de.properties → .../de/fumix/holidays/messages_de.properties b/...resources/holidays/holidays_de.properties → .../de/fumix/holidays/messages_de.properties
diff --git a/lib/src/main/resources/region_AT.properties → ...es/de/fumix/holidays/region_AT.properties b/lib/src/main/resources/region_AT.properties → ...es/de/fumix/holidays/region_AT.properties
diff --git a/lib/src/main/resources/region_DE.properties → ...es/de/fumix/holidays/region_DE.properties b/lib/src/main/resources/region_DE.properties → ...es/de/fumix/holidays/region_DE.properties