Rename com.r3corda -> net.corda

This commit is contained in:
Mike Hearn
2016-11-10 14:14:38 +01:00
parent 91c5f2ff57
commit ce99f354cb
4022 changed files with 2476 additions and 158936 deletions

View File

@ -1,10 +1,10 @@
package com.r3corda.client
package net.corda.client
import com.r3corda.core.random63BitValue
import com.r3corda.node.driver.driver
import com.r3corda.node.services.User
import com.r3corda.node.services.config.configureTestSSL
import com.r3corda.node.services.messaging.ArtemisMessagingComponent.Companion.toHostAndPort
import net.corda.core.random63BitValue
import net.corda.node.driver.driver
import net.corda.node.services.User
import net.corda.node.services.config.configureTestSSL
import net.corda.node.services.messaging.ArtemisMessagingComponent.Companion.toHostAndPort
import org.apache.activemq.artemis.api.core.ActiveMQSecurityException
import org.assertj.core.api.Assertions.assertThatExceptionOfType
import org.junit.After
@ -59,4 +59,4 @@ class CordaRPCClientTest {
}
}
}
}

View File

@ -1,28 +1,28 @@
package com.r3corda.client
package net.corda.client
import com.r3corda.client.model.NodeMonitorModel
import com.r3corda.client.model.ProgressTrackingEvent
import com.r3corda.core.bufferUntilSubscribed
import com.r3corda.core.contracts.*
import com.r3corda.core.node.NodeInfo
import com.r3corda.core.node.services.NetworkMapCache
import com.r3corda.core.node.services.ServiceInfo
import com.r3corda.core.node.services.StateMachineTransactionMapping
import com.r3corda.core.node.services.Vault
import com.r3corda.core.protocols.StateMachineRunId
import com.r3corda.core.serialization.OpaqueBytes
import com.r3corda.core.transactions.SignedTransaction
import com.r3corda.node.driver.driver
import com.r3corda.node.internal.CordaRPCOpsImpl
import com.r3corda.node.services.User
import com.r3corda.node.services.config.configureTestSSL
import com.r3corda.node.services.messaging.ArtemisMessagingComponent
import com.r3corda.node.services.messaging.StateMachineUpdate
import com.r3corda.node.services.network.NetworkMapService
import com.r3corda.node.services.transactions.SimpleNotaryService
import com.r3corda.testing.expect
import com.r3corda.testing.expectEvents
import com.r3corda.testing.sequence
import net.corda.client.model.NodeMonitorModel
import net.corda.client.model.ProgressTrackingEvent
import net.corda.core.bufferUntilSubscribed
import net.corda.core.contracts.*
import net.corda.core.node.NodeInfo
import net.corda.core.node.services.NetworkMapCache
import net.corda.core.node.services.ServiceInfo
import net.corda.core.node.services.StateMachineTransactionMapping
import net.corda.core.node.services.Vault
import net.corda.core.protocols.StateMachineRunId
import net.corda.core.serialization.OpaqueBytes
import net.corda.core.transactions.SignedTransaction
import net.corda.node.driver.driver
import net.corda.node.internal.CordaRPCOpsImpl
import net.corda.node.services.User
import net.corda.node.services.config.configureTestSSL
import net.corda.node.services.messaging.ArtemisMessagingComponent
import net.corda.node.services.messaging.StateMachineUpdate
import net.corda.node.services.network.NetworkMapService
import net.corda.node.services.transactions.SimpleNotaryService
import net.corda.testing.expect
import net.corda.testing.expectEvents
import net.corda.testing.sequence
import org.junit.After
import org.junit.Before
import org.junit.Test

View File

@ -1,14 +1,14 @@
package com.r3corda.client
package net.corda.client
import com.google.common.net.HostAndPort
import com.r3corda.client.impl.CordaRPCClientImpl
import com.r3corda.core.ThreadBox
import com.r3corda.node.services.config.NodeSSLConfiguration
import com.r3corda.node.services.messaging.ArtemisMessagingComponent
import com.r3corda.node.services.messaging.ArtemisMessagingComponent.Companion.CLIENTS_PREFIX
import com.r3corda.node.services.messaging.CordaRPCOps
import com.r3corda.node.services.messaging.RPCException
import com.r3corda.node.services.messaging.rpcLog
import net.corda.client.impl.CordaRPCClientImpl
import net.corda.core.ThreadBox
import net.corda.node.services.config.NodeSSLConfiguration
import net.corda.node.services.messaging.ArtemisMessagingComponent
import net.corda.node.services.messaging.ArtemisMessagingComponent.Companion.CLIENTS_PREFIX
import net.corda.node.services.messaging.CordaRPCOps
import net.corda.node.services.messaging.RPCException
import net.corda.node.services.messaging.rpcLog
import org.apache.activemq.artemis.api.core.ActiveMQNotConnectedException
import org.apache.activemq.artemis.api.core.client.ActiveMQClient
import org.apache.activemq.artemis.api.core.client.ClientSession
@ -77,7 +77,7 @@ class CordaRPCClient(val host: HostAndPort, override val config: NodeSSLConfigur
* calls from many threads at once you should cache one proxy per thread and reuse them. This function itself is
* thread safe though so requires no extra synchronisation.
*
* RPC sends and receives are logged on the com.r3corda.rpc logger.
* RPC sends and receives are logged on the net.corda.rpc logger.
*
* By default there are no timeouts on calls. RPCs can survive temporary losses or changes in connectivity,
* like switching between wifi networks. You can specify a timeout on the level of a proxy. If a call times
@ -116,4 +116,4 @@ class CordaRPCClient(val host: HostAndPort, override val config: NodeSSLConfigur
}
}
}
}
}

View File

@ -1,4 +1,4 @@
package com.r3corda.client.fxutils
package net.corda.client.fxutils
import javafx.collections.FXCollections
import javafx.collections.ListChangeListener

View File

@ -1,7 +1,7 @@
package com.r3corda.client.fxutils
package net.corda.client.fxutils
import com.r3corda.client.model.ExchangeRate
import com.r3corda.core.contracts.Amount
import net.corda.client.model.ExchangeRate
import net.corda.core.contracts.Amount
import javafx.beans.binding.Bindings
import javafx.beans.value.ObservableValue
import javafx.collections.ObservableList

View File

@ -1,4 +1,4 @@
package com.r3corda.client.fxutils
package net.corda.client.fxutils
import javafx.collections.ListChangeListener
import javafx.collections.ObservableList

View File

@ -1,4 +1,4 @@
package com.r3corda.client.fxutils
package net.corda.client.fxutils
import javafx.beans.Observable
import javafx.beans.value.ObservableValue

View File

@ -1,4 +1,4 @@
package com.r3corda.client.fxutils
package net.corda.client.fxutils
import co.paralleluniverse.common.util.VisibleForTesting
import javafx.collections.ListChangeListener

View File

@ -1,4 +1,4 @@
package com.r3corda.client.fxutils
package net.corda.client.fxutils
import javafx.beans.InvalidationListener
import javafx.beans.value.ChangeListener

View File

@ -1,4 +1,4 @@
package com.r3corda.client.fxutils
package net.corda.client.fxutils
import javafx.beans.property.SimpleObjectProperty
import javafx.beans.value.ObservableValue

View File

@ -1,4 +1,4 @@
package com.r3corda.client.fxutils
package net.corda.client.fxutils
import javafx.collections.FXCollections
import javafx.collections.MapChangeListener

View File

@ -1,4 +1,4 @@
package com.r3corda.client.fxutils
package net.corda.client.fxutils
import javafx.collections.ListChangeListener
import javafx.collections.ObservableList

View File

@ -1,4 +1,4 @@
package com.r3corda.client.fxutils
package net.corda.client.fxutils
import javafx.application.Platform
import javafx.beans.property.SimpleObjectProperty

View File

@ -1,4 +1,4 @@
package com.r3corda.client.fxutils
package net.corda.client.fxutils
import javafx.beans.binding.Bindings
import javafx.beans.property.ReadOnlyObjectWrapper
@ -274,4 +274,4 @@ fun <A> ObservableList<A>.last(): ObservableValue<A?> {
null
}
}, arrayOf(this))
}
}

View File

@ -1,4 +1,4 @@
package com.r3corda.client.fxutils
package net.corda.client.fxutils
import com.sun.javafx.collections.MapListenerHelper
import javafx.beans.InvalidationListener

View File

@ -1,4 +1,4 @@
package com.r3corda.client.fxutils
package net.corda.client.fxutils
import javafx.collections.ListChangeListener
import javafx.collections.ObservableList

View File

@ -1,4 +1,4 @@
package com.r3corda.client.impl
package net.corda.client.impl
import com.esotericsoftware.kryo.Kryo
import com.esotericsoftware.kryo.KryoException
@ -6,15 +6,15 @@ import com.esotericsoftware.kryo.Serializer
import com.esotericsoftware.kryo.io.Input
import com.esotericsoftware.kryo.io.Output
import com.google.common.cache.CacheBuilder
import com.r3corda.client.CordaRPCClient
import com.r3corda.core.ErrorOr
import com.r3corda.core.bufferUntilSubscribed
import com.r3corda.core.random63BitValue
import com.r3corda.core.serialization.deserialize
import com.r3corda.core.serialization.serialize
import com.r3corda.core.utilities.debug
import com.r3corda.core.utilities.trace
import com.r3corda.node.services.messaging.*
import net.corda.client.CordaRPCClient
import net.corda.core.ErrorOr
import net.corda.core.bufferUntilSubscribed
import net.corda.core.random63BitValue
import net.corda.core.serialization.deserialize
import net.corda.core.serialization.serialize
import net.corda.core.utilities.debug
import net.corda.core.utilities.trace
import net.corda.node.services.messaging.*
import org.apache.activemq.artemis.api.core.ActiveMQObjectClosedException
import org.apache.activemq.artemis.api.core.Message.HDR_DUPLICATE_DETECTION_ID
import org.apache.activemq.artemis.api.core.SimpleString

View File

@ -1,10 +1,10 @@
package com.r3corda.client.mock
package net.corda.client.mock
import com.r3corda.contracts.asset.Cash
import com.r3corda.core.contracts.*
import com.r3corda.core.crypto.Party
import com.r3corda.core.serialization.OpaqueBytes
import com.r3corda.core.transactions.TransactionBuilder
import net.corda.contracts.asset.Cash
import net.corda.core.contracts.*
import net.corda.core.crypto.Party
import net.corda.core.serialization.OpaqueBytes
import net.corda.core.transactions.TransactionBuilder
import java.time.Instant
/**

View File

@ -1,6 +1,6 @@
package com.r3corda.client.mock
package net.corda.client.mock
import com.r3corda.core.ErrorOr
import net.corda.core.ErrorOr
import java.util.*
/**

View File

@ -1,12 +1,12 @@
package com.r3corda.client.model
package net.corda.client.model
import com.r3corda.client.fxutils.foldToObservableList
import com.r3corda.client.fxutils.recordInSequence
import com.r3corda.contracts.asset.Cash
import com.r3corda.core.contracts.ContractState
import com.r3corda.core.contracts.StateAndRef
import com.r3corda.core.contracts.StateRef
import com.r3corda.core.node.services.Vault
import net.corda.client.fxutils.foldToObservableList
import net.corda.client.fxutils.recordInSequence
import net.corda.contracts.asset.Cash
import net.corda.core.contracts.ContractState
import net.corda.core.contracts.StateAndRef
import net.corda.core.contracts.StateRef
import net.corda.core.node.services.Vault
import javafx.collections.ObservableList
import kotlinx.support.jdk8.collections.removeIf
import rx.Observable

View File

@ -1,6 +1,6 @@
package com.r3corda.client.model
package net.corda.client.model
import com.r3corda.core.contracts.Amount
import net.corda.core.contracts.Amount
import javafx.beans.property.SimpleObjectProperty
import javafx.beans.value.ObservableValue
import java.util.*

View File

@ -1,14 +1,14 @@
package com.r3corda.client.model
package net.corda.client.model
import com.r3corda.client.fxutils.*
import com.r3corda.core.contracts.ContractState
import com.r3corda.core.contracts.StateAndRef
import com.r3corda.core.contracts.StateRef
import com.r3corda.core.crypto.SecureHash
import com.r3corda.core.node.services.StateMachineTransactionMapping
import com.r3corda.core.protocols.StateMachineRunId
import com.r3corda.core.transactions.SignedTransaction
import com.r3corda.node.services.messaging.StateMachineUpdate
import net.corda.client.fxutils.*
import net.corda.core.contracts.ContractState
import net.corda.core.contracts.StateAndRef
import net.corda.core.contracts.StateRef
import net.corda.core.crypto.SecureHash
import net.corda.core.node.services.StateMachineTransactionMapping
import net.corda.core.protocols.StateMachineRunId
import net.corda.core.transactions.SignedTransaction
import net.corda.node.services.messaging.StateMachineUpdate
import javafx.beans.property.SimpleObjectProperty
import javafx.beans.value.ObservableValue
import javafx.collections.ObservableList

View File

@ -1,4 +1,4 @@
package com.r3corda.client.model
package net.corda.client.model
import javafx.beans.property.ObjectProperty
import javafx.beans.value.ObservableValue

View File

@ -1,10 +1,10 @@
package com.r3corda.client.model
package net.corda.client.model
import com.r3corda.client.fxutils.foldToObservableList
import com.r3corda.client.fxutils.map
import com.r3corda.core.node.NodeInfo
import com.r3corda.core.node.services.NetworkMapCache
import com.r3corda.node.services.network.NetworkMapService
import net.corda.client.fxutils.foldToObservableList
import net.corda.client.fxutils.map
import net.corda.core.node.NodeInfo
import net.corda.core.node.services.NetworkMapCache
import net.corda.node.services.network.NetworkMapService
import javafx.collections.ObservableList
import kotlinx.support.jdk8.collections.removeIf
import java.security.PublicKey
@ -37,4 +37,4 @@ class NetworkIdentityModel {
fun lookup(publicKey: PublicKey): NodeInfo? {
return parties.firstOrNull { it.legalIdentity.owningKey == publicKey } ?: notaries.firstOrNull { it.notaryIdentity.owningKey == publicKey }
}
}
}

View File

@ -1,17 +1,17 @@
package com.r3corda.client.model
package net.corda.client.model
import com.google.common.net.HostAndPort
import com.r3corda.client.CordaRPCClient
import com.r3corda.core.contracts.ClientToServiceCommand
import com.r3corda.core.node.services.NetworkMapCache
import com.r3corda.core.node.services.StateMachineTransactionMapping
import com.r3corda.core.node.services.Vault
import com.r3corda.core.protocols.StateMachineRunId
import com.r3corda.core.transactions.SignedTransaction
import com.r3corda.node.services.config.NodeSSLConfiguration
import com.r3corda.node.services.messaging.CordaRPCOps
import com.r3corda.node.services.messaging.StateMachineInfo
import com.r3corda.node.services.messaging.StateMachineUpdate
import net.corda.client.CordaRPCClient
import net.corda.core.contracts.ClientToServiceCommand
import net.corda.core.node.services.NetworkMapCache
import net.corda.core.node.services.StateMachineTransactionMapping
import net.corda.core.node.services.Vault
import net.corda.core.protocols.StateMachineRunId
import net.corda.core.transactions.SignedTransaction
import net.corda.node.services.config.NodeSSLConfiguration
import net.corda.node.services.messaging.CordaRPCOps
import net.corda.node.services.messaging.StateMachineInfo
import net.corda.node.services.messaging.StateMachineUpdate
import javafx.beans.property.SimpleObjectProperty
import rx.Observable
import rx.subjects.PublishSubject
@ -102,4 +102,4 @@ class NodeMonitorModel {
}
proxyObservable.set(proxy)
}
}
}

View File

@ -1,15 +1,15 @@
package com.r3corda.client
package net.corda.client
import com.r3corda.client.impl.CordaRPCClientImpl
import com.r3corda.core.millis
import com.r3corda.core.random63BitValue
import com.r3corda.core.serialization.SerializedBytes
import com.r3corda.core.utilities.LogHelper
import com.r3corda.node.services.RPCUserService
import com.r3corda.node.services.User
import com.r3corda.node.services.messaging.*
import com.r3corda.node.services.messaging.ArtemisMessagingComponent.Companion.RPC_REQUESTS_QUEUE
import com.r3corda.node.utilities.AffinityExecutor
import net.corda.client.impl.CordaRPCClientImpl
import net.corda.core.millis
import net.corda.core.random63BitValue
import net.corda.core.serialization.SerializedBytes
import net.corda.core.utilities.LogHelper
import net.corda.node.services.RPCUserService
import net.corda.node.services.User
import net.corda.node.services.messaging.*
import net.corda.node.services.messaging.ArtemisMessagingComponent.Companion.RPC_REQUESTS_QUEUE
import net.corda.node.utilities.AffinityExecutor
import org.apache.activemq.artemis.api.core.Message.HDR_DUPLICATE_DETECTION_ID
import org.apache.activemq.artemis.api.core.SimpleString
import org.apache.activemq.artemis.api.core.TransportConfiguration
@ -92,7 +92,7 @@ class ClientRPCInfrastructureTests {
clientSession = sessionFactory.createSession()
clientSession.start()
LogHelper.setLevel("+com.r3corda.rpc")
LogHelper.setLevel("+net.corda.rpc")
}
private fun createProxyUsingReplyTo(username: String, timeout: Duration? = null): TestOps {
@ -249,4 +249,4 @@ class ClientRPCInfrastructureTests {
fail("RPC successfully returned using someone else's username for the reply-to")
}
}
}
}

View File

@ -1,4 +1,4 @@
package com.r3corda.client.fxutils
package net.corda.client.fxutils
import javafx.collections.FXCollections
import javafx.collections.ObservableList

View File

@ -1,4 +1,4 @@
package com.r3corda.client.fxutils
package net.corda.client.fxutils
import javafx.collections.FXCollections
import javafx.collections.ObservableList

View File

@ -1,4 +1,4 @@
package com.r3corda.client.fxutils
package net.corda.client.fxutils
import javafx.collections.FXCollections
import javafx.collections.ObservableList

View File

@ -1,4 +1,4 @@
package com.r3corda.client.fxutils
package net.corda.client.fxutils
import javafx.beans.property.SimpleObjectProperty
import javafx.collections.FXCollections

View File

@ -1,4 +1,4 @@
package com.r3corda.client.fxutils
package net.corda.client.fxutils
import javafx.collections.FXCollections
import javafx.collections.ObservableList

View File

@ -1,4 +1,4 @@
package com.r3corda.client.fxutils
package net.corda.client.fxutils
import javafx.collections.FXCollections
import javafx.collections.ObservableList

View File

@ -1,4 +1,4 @@
package com.r3corda.client.fxutils
package net.corda.client.fxutils
import javafx.collections.FXCollections
import org.junit.Before

View File

@ -1,4 +1,4 @@
package com.r3corda.client.fxutils
package net.corda.client.fxutils
import javafx.collections.MapChangeListener
import javafx.collections.ObservableMap