Spring/spring-data-gemfire
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

moved EnableGemfireFunction* annotations to config package and enhanced ForkUtils to handle spaces in file paths

Browse Source
This commit is contained in:
David Turanski
2013-02-05 14:33:24 -05:00
parent 00c78e394e
commit 5907c1389f
8 changed files with 42 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/test/java/org/springframework/data/gemfire/ForkUtil.java
View File

@@ -23,6 +23,8 @@ import java.io.InputStreamReader;
import java.io.OutputStream;
import java.util.concurrent.atomic.AtomicBoolean;
import org.springframework.util.StringUtils;
/**
* Utility for forking Java processes.
@@ -35,32 +37,55 @@ public class ForkUtil {
public static OutputStream cloneJVM(String arguments) {
private static OutputStream cloneJVM(String arguments) {
String cp = System.getProperty("java.class.path");
String home = System.getProperty("java.home");
Process proc = null;
String sp = System.getProperty("file.separator");
String java = home + sp + "bin" + sp + "java";
String argCp = " -cp " + cp;
String cmd = java + argCp + " " + arguments;
String[] args = arguments.split("\\s+");
String[] cmd = new String[args.length + 3];
cmd[0]=java;
cmd[1]="-cp";
cmd[2]=cp;
for (int i=3; i< cmd.length; i++) {
cmd[i] = args[i-3];
}
try {
//ProcessBuilder builder = new ProcessBuilder(cmd, argCp, argClass);
//builder.redirectErrorStream(true);
proc = Runtime.getRuntime().exec(cmd);
proc = Runtime.getRuntime().exec(cmd);
} catch (IOException ioe) {
throw new IllegalStateException("Cannot start command " + cmd, ioe);
System.out.println("[FORK-ERROR] " + ioe.getMessage());
throw new IllegalStateException("Cannot start command " + StringUtils.arrayToDelimitedString(cmd," "), ioe);
}
System.out.println("Started fork from command\n" + cmd);
System.out.println("Started fork from command\n" + StringUtils.arrayToDelimitedString(cmd," "));
final Process p = proc;
final BufferedReader br = new BufferedReader(new InputStreamReader(p.getInputStream()));
final BufferedReader er = new BufferedReader(new InputStreamReader(p.getErrorStream()));
final AtomicBoolean run = new AtomicBoolean(true);
Thread reader = new Thread(new Runnable() {
new Thread(new Runnable() {
public void run() {
try {
String line = null;
do {
while ((line = er.readLine()) != null) {
System.out.println("[FORK-ERROR] " + line);
}
Thread.sleep(200);
} while (run.get());
} catch (Exception ex) {
// ignore and exit
}
}
}).start();
new Thread(new Runnable() {
public void run() {
try {
@@ -75,9 +100,7 @@ public class ForkUtil {
// ignore and exit
}
}
});
reader.start();
}).start();
Runtime.getRuntime().addShutdownHook(new Thread() {
@Override

1
src/test/java/org/springframework/data/gemfire/function/config/FunctionExecutionClientCacheTests.java
View File

@@ -24,7 +24,6 @@ import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.ImportResource;
import org.springframework.data.gemfire.function.annotation.EnableGemfireFunctionExecutions;
import org.springframework.data.gemfire.function.execution.GemfireOnServerFunctionTemplate;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;

1
src/test/java/org/springframework/data/gemfire/function/config/FunctionExecutionIntegrationTests.java
View File

@@ -22,7 +22,6 @@ import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.ImportResource;
import org.springframework.data.gemfire.TestUtils;
import org.springframework.data.gemfire.function.annotation.EnableGemfireFunctionExecutions;
import org.springframework.data.gemfire.function.config.two.TestOnRegionFunction;
import org.springframework.data.gemfire.function.execution.GemfireOnRegionFunctionTemplate;
import org.springframework.data.gemfire.function.execution.OnRegionFunctionProxyFactoryBean;

4
src/test/java/org/springframework/data/gemfire/function/execution/FunctionIntegrationTests.java
View File

@@ -53,8 +53,8 @@ public class FunctionIntegrationTests {
@BeforeClass
public static void startUp() throws Exception {
ForkUtil.startCacheServer(SpringCacheServerProcess.class.getName() + " "
+ " /org/springframework/data/gemfire/function/execution/FunctionIntegrationTests-server-context.xml");
ForkUtil.startCacheServer(SpringCacheServerProcess.class.getName() +
" /org/springframework/data/gemfire/function/execution/FunctionIntegrationTests-server-context.xml");
}
@AfterClass