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

Move ShutdownHook to node-api. (#770)

Browse Source
This commit is contained in:
Andrzej Cichocki 2017-06-02 15:32:20 +01:00 committed by GitHub
parent 6104b107c0
commit c510e67ed5
6 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
package net.corda.core.internal package net.corda.nodeapi.internal
interface ShutdownHook { interface ShutdownHook {
/** /**

5
node/src/main/kotlin/net/corda/node/driver/Driver.kt
View File

@ -14,8 +14,7 @@ import net.corda.core.crypto.X509Utilities
import net.corda.core.crypto.appendToCommonName import net.corda.core.crypto.appendToCommonName
import net.corda.core.crypto.commonName import net.corda.core.crypto.commonName
import net.corda.core.identity.Party import net.corda.core.identity.Party
import net.corda.core.internal.ShutdownHook import net.corda.core.identity.PartyAndCertificate
import net.corda.core.internal.addShutdownHook
import net.corda.core.messaging.CordaRPCOps import net.corda.core.messaging.CordaRPCOps
import net.corda.core.node.NodeInfo import net.corda.core.node.NodeInfo
import net.corda.core.node.services.ServiceInfo import net.corda.core.node.services.ServiceInfo
@ -30,6 +29,8 @@ import net.corda.nodeapi.ArtemisMessagingComponent
import net.corda.nodeapi.User import net.corda.nodeapi.User
import net.corda.nodeapi.config.SSLConfiguration import net.corda.nodeapi.config.SSLConfiguration
import net.corda.nodeapi.config.parseAs import net.corda.nodeapi.config.parseAs
import net.corda.nodeapi.internal.ShutdownHook
import net.corda.nodeapi.internal.addShutdownHook
import okhttp3.OkHttpClient import okhttp3.OkHttpClient
import okhttp3.Request import okhttp3.Request
import org.bouncycastle.asn1.x500.X500Name import org.bouncycastle.asn1.x500.X500Name

2
node/src/main/kotlin/net/corda/node/internal/EnforceSingleNodeIsRunning.kt
View File

@ -1,6 +1,6 @@
package net.corda.node.internal package net.corda.node.internal
import net.corda.core.internal.addShutdownHook import net.corda.nodeapi.internal.addShutdownHook
import net.corda.core.div import net.corda.core.div
import java.io.RandomAccessFile import java.io.RandomAccessFile
import java.lang.management.ManagementFactory import java.lang.management.ManagementFactory

4
node/src/main/kotlin/net/corda/node/internal/Node.kt
View File

@ -5,9 +5,8 @@ import com.google.common.net.HostAndPort
import com.google.common.util.concurrent.Futures import com.google.common.util.concurrent.Futures
import com.google.common.util.concurrent.ListenableFuture import com.google.common.util.concurrent.ListenableFuture
import com.google.common.util.concurrent.SettableFuture import com.google.common.util.concurrent.SettableFuture
import net.corda.nodeapi.internal.ShutdownHook
import net.corda.core.flatMap import net.corda.core.flatMap
import net.corda.core.internal.ShutdownHook
import net.corda.core.internal.addShutdownHook
import net.corda.core.messaging.RPCOps import net.corda.core.messaging.RPCOps
import net.corda.core.minutes import net.corda.core.minutes
import net.corda.core.node.ServiceHub import net.corda.core.node.ServiceHub
@ -40,6 +39,7 @@ import net.corda.nodeapi.ArtemisMessagingComponent.Companion.PEER_USER
import net.corda.nodeapi.ArtemisMessagingComponent.NetworkMapAddress import net.corda.nodeapi.ArtemisMessagingComponent.NetworkMapAddress
import net.corda.nodeapi.ArtemisTcpTransport import net.corda.nodeapi.ArtemisTcpTransport
import net.corda.nodeapi.ConnectionDirection import net.corda.nodeapi.ConnectionDirection
import net.corda.nodeapi.internal.addShutdownHook
import org.apache.activemq.artemis.api.core.ActiveMQNotConnectedException import org.apache.activemq.artemis.api.core.ActiveMQNotConnectedException
import org.apache.activemq.artemis.api.core.RoutingType import org.apache.activemq.artemis.api.core.RoutingType
import org.apache.activemq.artemis.api.core.client.ActiveMQClient import org.apache.activemq.artemis.api.core.client.ActiveMQClient

2
node/src/main/kotlin/net/corda/node/services/transactions/PathManager.kt
View File

@ -1,6 +1,6 @@
package net.corda.node.services.transactions package net.corda.node.services.transactions
import net.corda.core.internal.addShutdownHook import net.corda.nodeapi.internal.addShutdownHook
import java.io.Closeable import java.io.Closeable
import java.nio.file.Path import java.nio.file.Path
import java.util.concurrent.atomic.AtomicInteger import java.util.concurrent.atomic.AtomicInteger

2
verifier/src/main/kotlin/net/corda/verifier/Verifier.kt
View File

@ -5,7 +5,7 @@ import com.typesafe.config.Config
import com.typesafe.config.ConfigFactory import com.typesafe.config.ConfigFactory
import com.typesafe.config.ConfigParseOptions import com.typesafe.config.ConfigParseOptions
import net.corda.core.ErrorOr import net.corda.core.ErrorOr
import net.corda.core.internal.addShutdownHook import net.corda.nodeapi.internal.addShutdownHook
import net.corda.core.div import net.corda.core.div
import net.corda.core.utilities.debug import net.corda.core.utilities.debug
import net.corda.core.utilities.loggerFor import net.corda.core.utilities.loggerFor