ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-13 04:38:19 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'master' into shams-merge-master-041217

Browse Source 
# Conflicts:
#	node/src/integration-test/kotlin/net/corda/node/services/DistributedServiceTests.kt
#	samples/bank-of-corda-demo/src/main/kotlin/net/corda/bank/BankOfCordaCordform.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/NodeTestUtils.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/internal/NodeBasedTest.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/MockNode.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/NotarySpec.kt
#	verifier/src/integration-test/kotlin/net/corda/verifier/VerifierDriver.kt
This commit is contained in:
Shams Asari
2017-12-04 13:39:32 +00:00
parent acd2281b20 d2f66acff7
commit 6a1aa59e3e
104 changed files with 1057 additions and 990 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
node-api/src/main/kotlin/net/corda/nodeapi/ArtemisTcpTransport.kt
View File

@ -3,7 +3,8 @@ package net.corda.nodeapi
import net.corda.core.identity.CordaX500Name
import net.corda.core.serialization.internal.nodeSerializationEnv
import net.corda.core.utilities.NetworkHostAndPort
import net.corda.nodeapi.config.SSLConfiguration
import net.corda.nodeapi.internal.config.SSLConfiguration
import net.corda.nodeapi.internal.requireOnDefaultFileSystem
import org.apache.activemq.artemis.api.core.TransportConfiguration
import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory
import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants

2
node-api/src/main/kotlin/net/corda/nodeapi/ArtemisUtils.kt → node-api/src/main/kotlin/net/corda/nodeapi/internal/ArtemisUtils.kt
View File

@ -1,6 +1,6 @@
@file:JvmName("ArtemisUtils")
package net.corda.nodeapi
package net.corda.nodeapi.internal
import java.nio.file.FileSystems
import java.nio.file.Path

4
node-api/src/main/kotlin/net/corda/nodeapi/config/ConfigUtilities.kt → node-api/src/main/kotlin/net/corda/nodeapi/internal/config/ConfigUtilities.kt
View File

@ -1,6 +1,6 @@
@file:JvmName("ConfigUtilities")
package net.corda.nodeapi.config
package net.corda.nodeapi.internal.config
import com.typesafe.config.Config
import com.typesafe.config.ConfigFactory
@ -200,4 +200,4 @@ private fun Iterable<*>.toConfigIterable(field: Field): Iterable<Any?> {
}
}
private val logger = LoggerFactory.getLogger("net.corda.nodeapi.config")
private val logger = LoggerFactory.getLogger("net.corda.nodeapi.internal.config")

2
node-api/src/main/kotlin/net/corda/nodeapi/config/SSLConfiguration.kt → node-api/src/main/kotlin/net/corda/nodeapi/internal/config/SSLConfiguration.kt
View File

@ -1,4 +1,4 @@
package net.corda.nodeapi.config
package net.corda.nodeapi.internal.config
import net.corda.core.internal.div
import java.nio.file.Path

5
node-api/src/main/kotlin/net/corda/nodeapi/User.kt → node-api/src/main/kotlin/net/corda/nodeapi/internal/config/User.kt
View File

@ -1,7 +1,4 @@
package net.corda.nodeapi
import net.corda.nodeapi.config.OldConfig
import net.corda.nodeapi.config.toConfig
package net.corda.nodeapi.internal.config
data class User(
@OldConfig("user")

2
node-api/src/test/kotlin/net/corda/nodeapi/config/ConfigParsingTest.kt → node-api/src/test/kotlin/net/corda/nodeapi/internal/config/ConfigParsingTest.kt
View File

@ -1,4 +1,4 @@
package net.corda.nodeapi.config
package net.corda.nodeapi.internal.config
import com.typesafe.config.Config
import com.typesafe.config.ConfigFactory.empty