| Chunk |
|---|
| Conflicting content |
|---|
public class KevoreeNodeRunner {
<<<<<<< HEAD
private Logger logger = LoggerFactory.getLogger(KevoreeNodeRunner.class);
private Process nodePlatformProcess;
private String platformJARPath;
public KevoreeNodeRunner(String nodeName, Integer basePort) {
//URL url = new URL(null,"cvs://server/project/folder#version", new PaxMvnUrlStreamHandlerFactory());
URL.setURLStreamHandlerFactory(new PaxMvnUrlStreamHandlerFactory());
}
public void startNode(String nodeName, Integer basePort) {
if (platformJARPath == null) {
getJar();
}
System.out.println("");
}
public void stopKillNode() {
try {
nodePlatformProcess.getOutputStream().write("stop 0".getBytes());
nodePlatformProcess.getOutputStream().flush();
} catch (IOException e) {
//e.printStackTrace();
logger.error("The node cannot be killed. Try to force kill", e.getCause());
nodePlatformProcess.destroy();
}
}
private void getJar() {
try {
URL mvnURL = new URL("mvn:org.kevoree.platform/org.kevoree.platform.osgi.standalone ");
InputStream stream = mvnURL.openConnection().getInputStream();
File f = File.createTempFile("org.kevoree.platform.osgi.standalone", ".jar");
f.deleteOnExit();
OutputStream outputStream = new FileOutputStream(f);
=======
public KevoreeNodeRunner(String nodeName, Integer basePort) {
>>>>>>> 5492e3ddde5dea0b1734e0cd0cd159d941b0f781
byte[] bytes = new byte[1024];
int length = 0; |
| Solution content |
|---|
public class KevoreeNodeRunner {
private Logger logger = LoggerFactory.getLogger(KevoreeNodeRunner.class);
private Process nodePlatformProcess;
private String platformJARPath;
public KevoreeNodeRunner(String nodeName, Integer basePort) {
//URL url = new URL(null,"cvs://server/project/folder#version", new PaxMvnUrlStreamHandlerFactory());
URL.setURLStreamHandlerFactory(new PaxMvnUrlStreamHandlerFactory());
}
public void startNode() {
System.out.println("StartNodeCommand");
if (platformJARPath == null) {
getJar();
}
System.out.println("");
}
public void stopKillNode() {
System.out.println("KillNodeCommand");
try {
nodePlatformProcess.getOutputStream().write("stop 0".getBytes());
nodePlatformProcess.getOutputStream().flush();
} catch (IOException e) {
//e.printStackTrace();
logger.error("The node cannot be killed. Try to force kill", e.getCause());
nodePlatformProcess.destroy();
}
}
private void getJar() {
try {
URL mvnURL = new URL("mvn:http://maven.kevoree.org/release!org.kevoree.platform/org.kevoree.platform.osgi.standalone");
InputStream stream = mvnURL.openConnection().getInputStream();
File f = File.createTempFile("org.kevoree.platform.osgi.standalone", ".jar");
f.deleteOnExit();
OutputStream outputStream = new FileOutputStream(f);
byte[] bytes = new byte[1024];
int length = 0; |
| File |
|---|
| KevoreeNodeRunner.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Attribute |
| Method declaration |
| Method invocation |
| Method signature |
| Try statement |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
}
}
<<<<<<< HEAD
public class PaxMvnUrlStreamHandlerFactory implements URLStreamHandlerFactory {
Handler handler;
public PaxMvnUrlStreamHandlerFactory() {
handler = new Handler();
}
@Override
public URLStreamHandler createURLStreamHandler(String protocol) {
return handler;
}
}
=======
public void startNode() {
System.out.println("StartNodeCommand");
}
public void stopKillNode() {
System.out.println("KillNodeCommand");
}
>>>>>>> 5492e3ddde5dea0b1734e0cd0cd159d941b0f781
} |
| Solution content |
|---|
}
}
public class PaxMvnUrlStreamHandlerFactory implements URLStreamHandlerFactory {
Handler handler;
public PaxMvnUrlStreamHandlerFactory() {
handler = new Handler();
}
@Override
public URLStreamHandler createURLStreamHandler(String protocol) {
return handler;
}
}
} |
| File |
|---|
| KevoreeNodeRunner.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Class declaration |
| Method declaration |