ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-27 08:22:35 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'open/master' into feature/vkolomeyko/os-merge

Browse Source 
# Conflicts:
#	samples/irs-demo/src/integration-test/kotlin/net/corda/test/spring/SpringDriver.kt
This commit is contained in:
Viktor Kolomeyko 2018-04-06 09:19:34 +01:00
commit df6c6b99cd
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
samples/irs-demo/src/integration-test/kotlin/net/corda/test/spring/SpringDriver.kt
View File

@ -94,7 +94,6 @@ data class SpringBootDriverDSL(private val driverDSL: DriverDSLImpl) : InternalD
), ),
classpath = ProcessUtilities.defaultClassPath, classpath = ProcessUtilities.defaultClassPath,
workingDirectory = handle.baseDirectory, workingDirectory = handle.baseDirectory,
errorLogPath = Paths.get("error.$className.log"),
arguments = listOf( arguments = listOf(
"--base-directory", handle.baseDirectory.toString(), "--base-directory", handle.baseDirectory.toString(),
"--server.port=${(handle as NodeHandleInternal).webAddress.port}", "--server.port=${(handle as NodeHandleInternal).webAddress.port}",

2
testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/DriverDSLImpl.kt
View File

@ -853,7 +853,6 @@ class DriverDSLImpl(
arguments = arguments, arguments = arguments,
jdwpPort = debugPort, jdwpPort = debugPort,
extraJvmArguments = extraJvmArguments + listOfNotNull(jolokiaAgent), extraJvmArguments = extraJvmArguments + listOfNotNull(jolokiaAgent),
errorLogPath = config.corda.baseDirectory / NodeStartup.LOGS_DIRECTORY_NAME / "error.log",
workingDirectory = config.corda.baseDirectory, workingDirectory = config.corda.baseDirectory,
maximumHeapSize = maximumHeapSize maximumHeapSize = maximumHeapSize
) )
@ -870,7 +869,6 @@ class DriverDSLImpl(
"-Dname=node-${handle.p2pAddress}-webserver", "-Dname=node-${handle.p2pAddress}-webserver",
"-Djava.io.tmpdir=${System.getProperty("java.io.tmpdir")}" // Inherit from parent process "-Djava.io.tmpdir=${System.getProperty("java.io.tmpdir")}" // Inherit from parent process
), ),
errorLogPath = Paths.get("error.$className.log"),
workingDirectory = null, workingDirectory = null,
maximumHeapSize = maximumHeapSize maximumHeapSize = maximumHeapSize
) )

6
testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/ProcessUtilities.kt
View File

@ -21,7 +21,7 @@ object ProcessUtilities {
jdwpPort: Int? = null, jdwpPort: Int? = null,
extraJvmArguments: List<String> = emptyList() extraJvmArguments: List<String> = emptyList()
): Process { ): Process {
return startJavaProcessImpl(C::class.java.name, arguments, defaultClassPath, jdwpPort, extraJvmArguments, null, null, null) return startJavaProcessImpl(C::class.java.name, arguments, defaultClassPath, jdwpPort, extraJvmArguments, null, null)
} }
fun startCordaProcess( fun startCordaProcess(
@ -29,13 +29,12 @@ object ProcessUtilities {
arguments: List<String>, arguments: List<String>,
jdwpPort: Int?, jdwpPort: Int?,
extraJvmArguments: List<String>, extraJvmArguments: List<String>,
errorLogPath: Path?,
workingDirectory: Path?, workingDirectory: Path?,
maximumHeapSize: String maximumHeapSize: String
): Process { ): Process {
// FIXME: Instead of hacking our classpath, use the correct classpath for className. // FIXME: Instead of hacking our classpath, use the correct classpath for className.
val classpath = defaultClassPath.split(pathSeparator).filter { !(it / "log4j2-test.xml").exists() }.joinToString(pathSeparator) val classpath = defaultClassPath.split(pathSeparator).filter { !(it / "log4j2-test.xml").exists() }.joinToString(pathSeparator)
return startJavaProcessImpl(className, arguments, classpath, jdwpPort, extraJvmArguments, errorLogPath, workingDirectory, maximumHeapSize) return startJavaProcessImpl(className, arguments, classpath, jdwpPort, extraJvmArguments, workingDirectory, maximumHeapSize)
} }
fun startJavaProcessImpl( fun startJavaProcessImpl(
@ -44,7 +43,6 @@ object ProcessUtilities {
classpath: String, classpath: String,
jdwpPort: Int?, jdwpPort: Int?,
extraJvmArguments: List<String>, extraJvmArguments: List<String>,
errorLogPath: Path?,
workingDirectory: Path?, workingDirectory: Path?,
maximumHeapSize: String? maximumHeapSize: String?
): Process { ): Process {