Make all Pipeline properties uniform

i.e. make them all start with "org.daisy.pipeline". This includes the TTS properties, which now start with "org.daisy.pipeline.tts". see daisy/pipeline-assembly#141
daisy · Jan 25, 2018 · 1028ef0 · 1028ef0
1 parent d5b5631
commit 1028ef0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/audio-utils/audio-encoder-lame/src/main/java/org/daisy/pipeline/audio/lame/LameEncoder.java b/audio-utils/audio-encoder-lame/src/main/java/org/daisy/pipeline/audio/lame/LameEncoder.java
@@ -127,12 +127,12 @@ public EncodingOptions parseEncodingOptions(Map<String, String> params) {
 		LameEncodingOptions opts = new LameEncodingOptions();
 
 		opts.cliOptions = new String[0];
-		String cliextra = params.get("lame.cli.options");
+		String cliextra = params.get("org.daisy.pipeline.tts.lame.cli.options");
 		if (cliextra != null) {
 			opts.cliOptions = cliextra.split(" ");
 		}
 
-		String lamePathProp = "lame.path";
+		String lamePathProp = "org.daisy.pipeline.tts.lame.path";
 		opts.binpath = params.get(lamePathProp);
 		if (opts.binpath == null) {
 			Optional<String> lpath = BinaryFinder.find("lame");

diff --git a/audio-utils/audio-encoder-lame/src/test/java/org/daisy/pipeline/audio/lame/LameTest.java b/audio-utils/audio-encoder-lame/src/test/java/org/daisy/pipeline/audio/lame/LameTest.java
@@ -48,7 +48,7 @@ public AudioBufferTest(byte[] data, int size) {
 
 	@Before
 	public void cleanProperties() {
-		System.setProperty("host.protection", "true");
+		System.setProperty("org.daisy.pipeline.tts.host.protection", "true");
 	}
 
 	private static byte[] mp3ToPCM(AudioFormat originalFormat, String mp3File)
@@ -185,7 +185,7 @@ private boolean isValid(AudioFormat sourceFormat) throws Throwable {
 
 	@Test
 	public void noHostProtection() throws Throwable {
-		System.setProperty("host.protection", "false");
+		System.setProperty("org.daisy.pipeline.tts.host.protection", "false");
 		boolean valid = isValid(new AudioFormat(8000, 8, 1, true, true));
 		Assert.assertTrue(valid);
 	}