Author: [email protected]
Date: Tue May 3 09:39:48 2011
New Revision: 1080
Log:
[AMDATUCASSANDRA-7] Performance test fix for new project setup
Modified:
trunk/test-performance/src/main/java/org/amdatu/test/performance/runtest/AmdatuLauncher.java
Modified:
trunk/test-performance/src/main/java/org/amdatu/test/performance/runtest/AmdatuLauncher.java
==============================================================================
---
trunk/test-performance/src/main/java/org/amdatu/test/performance/runtest/AmdatuLauncher.java
(original)
+++
trunk/test-performance/src/main/java/org/amdatu/test/performance/runtest/AmdatuLauncher.java
Tue May 3 09:39:48 2011
@@ -15,16 +15,16 @@
*/
package org.amdatu.test.performance.runtest;
-import java.io.File;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.amdatu.test.performance.Utils;
-import org.apache.commons.io.FileUtils;
+import java.io.File;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.amdatu.test.performance.Utils;
+import org.apache.commons.io.FileUtils;
/**
* This class is responsible for starting/stopping Amdatu distributions from a
single zip file.
@@ -142,17 +142,20 @@
File exampleDir = new File (m_tmpDir, "amdatu-examples");
FileUtils.deleteDirectory(exampleDir);
- // Remove from Felix config properties
- File felixConfig = new File(m_tmpDir, "conf/felix-config.properties");
- List<String> lines = FileUtils.readLines(felixConfig);
- List<String> newLines = new ArrayList<String>();
- for (String line : lines) {
- if
(line.indexOf("reference:file:amdatu-examples/org.amdatu.example.") == -1) {
- newLines.add(line);
+ // Remove from Felix config properties. Note that if
felix-config.properties does not exist,
+ // this is a newer version which does not include examples anyway and
so we can skip it
+ File felixConfig = new File(m_tmpDir, "conf/felix-config.properties");
+ if (felixConfig.exists()) {
+ List<String> lines = FileUtils.readLines(felixConfig);
+ List<String> newLines = new ArrayList<String>();
+ for (String line : lines) {
+ if
(line.indexOf("reference:file:amdatu-examples/org.amdatu.example.") == -1) {
+ newLines.add(line);
+ }
}
+ felixConfig.delete();
+ FileUtils.writeLines(felixConfig, newLines);
}
- felixConfig.delete();
- FileUtils.writeLines(felixConfig, newLines);
}
private void addTestBundles() throws IOException {
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
