ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-03-10 22:44:20 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Rename com.r3corda -> net.corda

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build.gradle
View File

@ -47,7 +47,7 @@ allprojects {
}
// Our version: bump this on release.
group 'com.r3corda'
group 'net.corda'
version '0.6-SNAPSHOT'
}
@ -92,7 +92,7 @@ tasks.withType(Test) {
// TODO: Move fat JAR building into node subproject.
task buildCordaJAR(type: FatCapsule, dependsOn: ['quasarScan', 'buildCertSigningRequestUtilityJAR']) {
applicationClass 'com.r3corda.node.MainKt'
applicationClass 'net.corda.node.MainKt'
archiveName 'corda.jar'
applicationSource = files(project.tasks.findByName('jar'), 'node/build/classes/main/CordaCaplet.class')
@ -106,7 +106,7 @@ task buildCordaJAR(type: FatCapsule, dependsOn: ['quasarScan', 'buildCertSigning
}
task buildCertSigningRequestUtilityJAR(type: FatCapsule, dependsOn: project.jar) {
applicationClass 'com.r3corda.node.utilities.certsigning.CertificateSignerKt'
applicationClass 'net.corda.node.utilities.certsigning.CertificateSignerKt'
archiveName 'certSigningRequestUtility.jar'
capsuleManifest {
systemProperties['log4j.configuration'] = 'log4j2.xml'

14
client/src/integration-test/kotlin/com/r3corda/client/CordaRPCClientTest.kt → client/src/integration-test/kotlin/net/corda/client/CordaRPCClientTest.kt
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 {
}
}
}
}

48
client/src/integration-test/kotlin/com/r3corda/client/NodeMonitorModelTest.kt → client/src/integration-test/kotlin/net/corda/client/NodeMonitorModelTest.kt
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

22
client/src/main/kotlin/com/r3corda/client/CordaRPCClient.kt → client/src/main/kotlin/net/corda/client/CordaRPCClient.kt
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
}
}
}
}
}

2
client/src/main/kotlin/com/r3corda/client/fxutils/AggregatedList.kt → client/src/main/kotlin/net/corda/client/fxutils/AggregatedList.kt
View File

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

6
client/src/main/kotlin/com/r3corda/client/fxutils/AmountBindings.kt → client/src/main/kotlin/net/corda/client/fxutils/AmountBindings.kt
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

2
client/src/main/kotlin/com/r3corda/client/fxutils/AssociatedList.kt → client/src/main/kotlin/net/corda/client/fxutils/AssociatedList.kt
View File

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

2
client/src/main/kotlin/com/r3corda/client/fxutils/ChosenList.kt → client/src/main/kotlin/net/corda/client/fxutils/ChosenList.kt
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

2
client/src/main/kotlin/com/r3corda/client/fxutils/ConcatenatedList.kt → client/src/main/kotlin/net/corda/client/fxutils/ConcatenatedList.kt
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

2
client/src/main/kotlin/com/r3corda/client/fxutils/FlattenedList.kt → client/src/main/kotlin/net/corda/client/fxutils/FlattenedList.kt
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

2
client/src/main/kotlin/com/r3corda/client/fxutils/LeftOuterJoinedMap.kt → client/src/main/kotlin/net/corda/client/fxutils/LeftOuterJoinedMap.kt
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

2
client/src/main/kotlin/com/r3corda/client/fxutils/MapValuesList.kt → client/src/main/kotlin/net/corda/client/fxutils/MapValuesList.kt
View File

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

2
client/src/main/kotlin/com/r3corda/client/fxutils/MappedList.kt → client/src/main/kotlin/net/corda/client/fxutils/MappedList.kt
View File

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

2
client/src/main/kotlin/com/r3corda/client/fxutils/ObservableFold.kt → client/src/main/kotlin/net/corda/client/fxutils/ObservableFold.kt
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

4
client/src/main/kotlin/com/r3corda/client/fxutils/ObservableUtilities.kt → client/src/main/kotlin/net/corda/client/fxutils/ObservableUtilities.kt
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))
}
}

2
client/src/main/kotlin/com/r3corda/client/fxutils/ReadOnlyBackedObservableMapBase.kt → client/src/main/kotlin/net/corda/client/fxutils/ReadOnlyBackedObservableMapBase.kt
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

2
client/src/main/kotlin/com/r3corda/client/fxutils/ReplayedList.kt → client/src/main/kotlin/net/corda/client/fxutils/ReplayedList.kt
View File

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

20
client/src/main/kotlin/com/r3corda/client/impl/CordaRPCClientImpl.kt → client/src/main/kotlin/net/corda/client/impl/CordaRPCClientImpl.kt
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

12
client/src/main/kotlin/com/r3corda/client/mock/EventGenerator.kt → client/src/main/kotlin/net/corda/client/mock/EventGenerator.kt
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
/**

4
client/src/main/kotlin/com/r3corda/client/mock/Generator.kt → client/src/main/kotlin/net/corda/client/mock/Generator.kt
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.*
/**

16
client/src/main/kotlin/com/r3corda/client/model/ContractStateModel.kt → client/src/main/kotlin/net/corda/client/model/ContractStateModel.kt
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

4
client/src/main/kotlin/com/r3corda/client/model/ExchangeRateModel.kt → client/src/main/kotlin/net/corda/client/model/ExchangeRateModel.kt
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.*

20
client/src/main/kotlin/com/r3corda/client/model/GatheredTransactionDataModel.kt → client/src/main/kotlin/net/corda/client/model/GatheredTransactionDataModel.kt
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

2
client/src/main/kotlin/com/r3corda/client/model/Models.kt → client/src/main/kotlin/net/corda/client/model/Models.kt
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

14
client/src/main/kotlin/com/r3corda/client/model/NetworkIdentityModel.kt → client/src/main/kotlin/net/corda/client/model/NetworkIdentityModel.kt
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 }
}
}
}

26
client/src/main/kotlin/com/r3corda/client/model/NodeMonitorModel.kt → client/src/main/kotlin/net/corda/client/model/NodeMonitorModel.kt
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)
}
}
}

26
client/src/test/kotlin/com/r3corda/client/ClientRPCInfrastructureTests.kt → client/src/test/kotlin/net/corda/client/ClientRPCInfrastructureTests.kt
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")
}
}
}
}

2
client/src/test/kotlin/com/r3corda/client/fxutils/AggregatedListTest.kt → client/src/test/kotlin/net/corda/client/fxutils/AggregatedListTest.kt
View File

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

2
client/src/test/kotlin/com/r3corda/client/fxutils/AssociatedListTest.kt → client/src/test/kotlin/net/corda/client/fxutils/AssociatedListTest.kt
View File

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

2
client/src/test/kotlin/com/r3corda/client/fxutils/ConcatenatedListTest.kt → client/src/test/kotlin/net/corda/client/fxutils/ConcatenatedListTest.kt
View File

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

2
client/src/test/kotlin/com/r3corda/client/fxutils/FlattenedListTest.kt → client/src/test/kotlin/net/corda/client/fxutils/FlattenedListTest.kt
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

2
client/src/test/kotlin/com/r3corda/client/fxutils/LeftOuterJoinedMapTest.kt → client/src/test/kotlin/net/corda/client/fxutils/LeftOuterJoinedMapTest.kt
View File

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

2
client/src/test/kotlin/com/r3corda/client/fxutils/MappedListTest.kt → client/src/test/kotlin/net/corda/client/fxutils/MappedListTest.kt
View File

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

2
client/src/test/kotlin/com/r3corda/client/fxutils/ReplayedListTest.kt → client/src/test/kotlin/net/corda/client/fxutils/ReplayedListTest.kt
View File

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

2
client/src/test/kotlin/com/r3corda/client/fxutils/ReplayedMap.kt → client/src/test/kotlin/net/corda/client/fxutils/ReplayedMap.kt
View File

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

4
config/dev/log4j2.xml
View File

@ -50,10 +50,10 @@
<AppenderRef ref="Console-Appender"/>
<AppenderRef ref="RollingFile-Appender"/>
</Root>
<Logger name="com.r3corda" level="info" additivity="false">
<Logger name="net.corda" level="info" additivity="false">
<AppenderRef ref="Console-Appender"/>
<AppenderRef ref="RollingFile-Appender"/>
</Logger>
</Loggers>
</Configuration>
</Configuration>

4
config/test/log4j2.xml
View File

@ -13,8 +13,8 @@
<Root level="info">
<AppenderRef ref="Console-Appender"/>
</Root>
<Logger name="com.r3corda" level="info" additivity="false">
<Logger name="net.corda. level="info" additivity="false">
<AppenderRef ref="Console-Appender"/>
</Logger>
</Loggers>
</Configuration>
</Configuration>

2
core/src/main/java/com/r3corda/core/crypto/AddressFormatException.java → core/src/main/java/net/corda/core/crypto/AddressFormatException.java
View File

@ -1,4 +1,4 @@
package com.r3corda.core.crypto;
package net.corda.core.crypto;
public class AddressFormatException extends IllegalArgumentException {
public AddressFormatException() {

2
core/src/main/java/com/r3corda/core/crypto/Base58.java → core/src/main/java/net/corda/core/crypto/Base58.java
View File

@ -1,4 +1,4 @@
package com.r3corda.core.crypto;
package net.corda.core.crypto;
import java.math.*;
import java.util.*;

4
core/src/main/kotlin/com/r3corda/core/Utils.kt → core/src/main/kotlin/net/corda/core/core/Utils.kt
View File

@ -1,4 +1,4 @@
package com.r3corda.core
package net.corda.core
import com.google.common.base.Function
import com.google.common.base.Throwables
@ -7,7 +7,7 @@ import com.google.common.util.concurrent.Futures
import com.google.common.util.concurrent.ListenableFuture
import com.google.common.util.concurrent.MoreExecutors
import com.google.common.util.concurrent.SettableFuture
import com.r3corda.core.crypto.newSecureRandom
import net.corda.core.crypto.newSecureRandom
import kotlinx.support.jdk7.use
import org.slf4j.Logger
import rx.Observable

6
core/src/main/kotlin/com/r3corda/core/contracts/ClientToServiceCommand.kt → core/src/main/kotlin/net/corda/core/core/contracts/ClientToServiceCommand.kt
View File

@ -1,7 +1,7 @@
package com.r3corda.core.contracts
package net.corda.core.contracts
import com.r3corda.core.crypto.Party
import com.r3corda.core.serialization.OpaqueBytes
import net.corda.core.crypto.Party
import net.corda.core.serialization.OpaqueBytes
import java.security.PublicKey
import java.util.*

4
core/src/main/kotlin/com/r3corda/core/contracts/ContractsDSL.kt → core/src/main/kotlin/net/corda/core/core/contracts/ContractsDSL.kt
View File

@ -1,7 +1,7 @@
@file:JvmName("ContractsDSL")
package com.r3corda.core.contracts
package net.corda.core.contracts
import com.r3corda.core.crypto.Party
import net.corda.core.crypto.Party
import java.security.PublicKey
import java.util.*

8
core/src/main/kotlin/com/r3corda/core/contracts/DummyContract.kt → core/src/main/kotlin/net/corda/core/core/contracts/DummyContract.kt
View File

@ -1,8 +1,8 @@
package com.r3corda.core.contracts
package net.corda.core.contracts
import com.r3corda.core.crypto.Party
import com.r3corda.core.crypto.SecureHash
import com.r3corda.core.transactions.TransactionBuilder
import net.corda.core.crypto.Party
import net.corda.core.crypto.SecureHash
import net.corda.core.transactions.TransactionBuilder
import java.security.PublicKey
// The dummy contract doesn't do anything useful. It exists for testing purposes.

4
core/src/main/kotlin/com/r3corda/core/contracts/DummyState.kt → core/src/main/kotlin/net/corda/core/core/contracts/DummyState.kt
View File

@ -1,4 +1,4 @@
package com.r3corda.core.contracts
package net.corda.core.contracts
import java.security.PublicKey
@ -9,4 +9,4 @@ data class DummyState(val magicNumber: Int = 0) : ContractState {
override val contract = DUMMY_PROGRAM_ID
override val participants: List<PublicKey>
get() = emptyList()
}
}

2
core/src/main/kotlin/com/r3corda/core/contracts/FinanceTypes.kt → core/src/main/kotlin/net/corda/core/core/contracts/FinanceTypes.kt
View File

@ -1,4 +1,4 @@
package com.r3corda.core.contracts
package net.corda.core.contracts
import com.fasterxml.jackson.core.JsonGenerator
import com.fasterxml.jackson.core.JsonParser

2
core/src/main/kotlin/com/r3corda/core/contracts/FungibleAsset.kt → core/src/main/kotlin/net/corda/core/core/contracts/FungibleAsset.kt
View File

@ -1,4 +1,4 @@
package com.r3corda.core.contracts
package net.corda.core.contracts
import java.security.PublicKey

22
core/src/main/kotlin/com/r3corda/core/contracts/Structures.kt → core/src/main/kotlin/net/corda/core/core/contracts/Structures.kt
View File

@ -1,15 +1,15 @@
package com.r3corda.core.contracts
package net.corda.core.contracts
import com.r3corda.core.contracts.clauses.Clause
import com.r3corda.core.crypto.Party
import com.r3corda.core.crypto.SecureHash
import com.r3corda.core.crypto.toStringShort
import com.r3corda.core.node.services.ServiceType
import com.r3corda.core.protocols.ProtocolLogicRef
import com.r3corda.core.protocols.ProtocolLogicRefFactory
import com.r3corda.core.serialization.OpaqueBytes
import com.r3corda.core.serialization.serialize
import com.r3corda.core.transactions.TransactionBuilder
import net.corda.core.contracts.clauses.Clause
import net.corda.core.crypto.Party
import net.corda.core.crypto.SecureHash
import net.corda.core.crypto.toStringShort
import net.corda.core.node.services.ServiceType
import net.corda.core.protocols.ProtocolLogicRef
import net.corda.core.protocols.ProtocolLogicRefFactory
import net.corda.core.serialization.OpaqueBytes
import net.corda.core.serialization.serialize
import net.corda.core.transactions.TransactionBuilder
import java.io.FileNotFoundException
import java.io.InputStream
import java.io.OutputStream

10
core/src/main/kotlin/com/r3corda/core/contracts/TransactionGraphSearch.kt → core/src/main/kotlin/net/corda/core/core/contracts/TransactionGraphSearch.kt
View File

@ -1,9 +1,9 @@
package com.r3corda.core.contracts
package net.corda.core.contracts
import com.r3corda.core.crypto.SecureHash
import com.r3corda.core.node.services.ReadOnlyTransactionStorage
import com.r3corda.core.transactions.SignedTransaction
import com.r3corda.core.transactions.WireTransaction
import net.corda.core.crypto.SecureHash
import net.corda.core.node.services.ReadOnlyTransactionStorage
import net.corda.core.transactions.SignedTransaction
import net.corda.core.transactions.WireTransaction
import java.util.*
import java.util.concurrent.Callable

8
core/src/main/kotlin/com/r3corda/core/contracts/TransactionTypes.kt → core/src/main/kotlin/net/corda/core/core/contracts/TransactionTypes.kt
View File

@ -1,8 +1,8 @@
package com.r3corda.core.contracts
package net.corda.core.contracts
import com.r3corda.core.crypto.Party
import com.r3corda.core.transactions.LedgerTransaction
import com.r3corda.core.transactions.TransactionBuilder
import net.corda.core.crypto.Party
import net.corda.core.transactions.LedgerTransaction
import net.corda.core.transactions.TransactionBuilder
import java.security.PublicKey
/** Defines transaction build & validation logic for a specific transaction type */

10
core/src/main/kotlin/com/r3corda/core/contracts/TransactionVerification.kt → core/src/main/kotlin/net/corda/core/core/contracts/TransactionVerification.kt
View File

@ -1,9 +1,9 @@
package com.r3corda.core.contracts
package net.corda.core.contracts
import com.r3corda.core.crypto.Party
import com.r3corda.core.crypto.SecureHash
import com.r3corda.core.crypto.toStringShort
import com.r3corda.core.transactions.LedgerTransaction
import net.corda.core.crypto.Party
import net.corda.core.crypto.SecureHash
import net.corda.core.crypto.toStringShort
import net.corda.core.transactions.LedgerTransaction
import java.security.PublicKey
import java.util.*

12
core/src/main/kotlin/com/r3corda/core/contracts/clauses/AllComposition.kt → core/src/main/kotlin/net/corda/core/core/contracts/clauses/AllComposition.kt
View File

@ -1,9 +1,9 @@
package com.r3corda.core.contracts.clauses
package net.corda.core.contracts.clauses
import com.r3corda.core.contracts.AuthenticatedObject
import com.r3corda.core.contracts.CommandData
import com.r3corda.core.contracts.ContractState
import com.r3corda.core.contracts.TransactionForContract
import net.corda.core.contracts.AuthenticatedObject
import net.corda.core.contracts.CommandData
import net.corda.core.contracts.ContractState
import net.corda.core.contracts.TransactionForContract
import java.util.*
/**
@ -36,4 +36,4 @@ class AllComposition<S : ContractState, C : CommandData, K : Any>(firstClause: C
}
override fun toString() = "All: $clauses.toList()"
}
}

12
core/src/main/kotlin/com/r3corda/core/contracts/clauses/AnyComposition.kt → core/src/main/kotlin/net/corda/core/core/contracts/clauses/AnyComposition.kt
View File

@ -1,9 +1,9 @@
package com.r3corda.core.contracts.clauses
package net.corda.core.contracts.clauses
import com.r3corda.core.contracts.AuthenticatedObject
import com.r3corda.core.contracts.CommandData
import com.r3corda.core.contracts.ContractState
import com.r3corda.core.contracts.TransactionForContract
import net.corda.core.contracts.AuthenticatedObject
import net.corda.core.contracts.CommandData
import net.corda.core.contracts.ContractState
import net.corda.core.contracts.TransactionForContract
import java.util.*
/**
@ -22,4 +22,4 @@ class AnyComposition<in S : ContractState, C : CommandData, in K : Any>(vararg r
}
override fun toString(): String = "Or: ${clauses.toList()}"
}
}

14
core/src/main/kotlin/com/r3corda/core/contracts/clauses/Clause.kt → core/src/main/kotlin/net/corda/core/core/contracts/clauses/Clause.kt
View File

@ -1,10 +1,10 @@
package com.r3corda.core.contracts.clauses
package net.corda.core.contracts.clauses
import com.r3corda.core.contracts.AuthenticatedObject
import com.r3corda.core.contracts.CommandData
import com.r3corda.core.contracts.ContractState
import com.r3corda.core.contracts.TransactionForContract
import com.r3corda.core.utilities.loggerFor
import net.corda.core.contracts.AuthenticatedObject
import net.corda.core.contracts.CommandData
import net.corda.core.contracts.ContractState
import net.corda.core.contracts.TransactionForContract
import net.corda.core.utilities.loggerFor
/**
* A clause of a contract, containing a chunk of verification logic. That logic may be delegated to other clauses, or
@ -66,4 +66,4 @@ fun <C : CommandData> Clause<*, C, *>.matches(commands: List<AuthenticatedObject
true
else
commands.map { it.value.javaClass }.toSet().containsAll(requiredCommands)
}
}

6
core/src/main/kotlin/com/r3corda/core/contracts/clauses/ClauseVerifier.kt → core/src/main/kotlin/net/corda/core/core/contracts/clauses/ClauseVerifier.kt
View File

@ -1,7 +1,7 @@
@file:JvmName("ClauseVerifier")
package com.r3corda.core.contracts.clauses
package net.corda.core.contracts.clauses
import com.r3corda.core.contracts.*
import net.corda.core.contracts.*
/**
* Verify a transaction against the given list of clauses.
@ -22,4 +22,4 @@ fun <C: CommandData> verifyClause(tx: TransactionForContract,
val matchedCommands = clause.verify(tx, tx.inputs, tx.outputs, commands, null)
check(matchedCommands.containsAll(commands.map { it.value })) { "The following commands were not matched at the end of execution: " + (commands - matchedCommands) }
}
}

10
core/src/main/kotlin/com/r3corda/core/contracts/clauses/CompositeClause.kt → core/src/main/kotlin/net/corda/core/core/contracts/clauses/CompositeClause.kt
View File

@ -1,8 +1,8 @@
package com.r3corda.core.contracts.clauses
package net.corda.core.contracts.clauses
import com.r3corda.core.contracts.AuthenticatedObject
import com.r3corda.core.contracts.CommandData
import com.r3corda.core.contracts.ContractState
import net.corda.core.contracts.AuthenticatedObject
import net.corda.core.contracts.CommandData
import net.corda.core.contracts.ContractState
/**
* Abstract supertype for clauses which compose other clauses together in some logical manner.
@ -14,4 +14,4 @@ abstract class CompositeClause<in S : ContractState, C: CommandData, in K : Any>
= matchedClauses(commands).flatMap { it.getExecutionPath(commands) }
/** Determine which clauses are matched by the supplied commands */
abstract fun matchedClauses(commands: List<AuthenticatedObject<C>>): List<Clause<S, C, K>>
}
}

12
core/src/main/kotlin/com/r3corda/core/contracts/clauses/FilterOn.kt → core/src/main/kotlin/net/corda/core/core/contracts/clauses/FilterOn.kt
View File

@ -1,9 +1,9 @@
package com.r3corda.core.contracts.clauses
package net.corda.core.contracts.clauses
import com.r3corda.core.contracts.AuthenticatedObject
import com.r3corda.core.contracts.CommandData
import com.r3corda.core.contracts.ContractState
import com.r3corda.core.contracts.TransactionForContract
import net.corda.core.contracts.AuthenticatedObject
import net.corda.core.contracts.CommandData
import net.corda.core.contracts.ContractState
import net.corda.core.contracts.TransactionForContract
/**
* Filter the states that are passed through to the wrapped clause, to restrict them to a specific type.
@ -22,4 +22,4 @@ class FilterOn<S : ContractState, C : CommandData, K : Any>(val clause: Clause<S
commands: List<AuthenticatedObject<C>>,
groupingKey: K?): Set<C>
= clause.verify(tx, filterStates(inputs), filterStates(outputs), commands, groupingKey)
}
}

14
core/src/main/kotlin/com/r3corda/core/contracts/clauses/FirstComposition.kt → core/src/main/kotlin/net/corda/core/core/contracts/clauses/FirstComposition.kt
View File

@ -1,10 +1,10 @@
package com.r3corda.core.contracts.clauses
package net.corda.core.contracts.clauses
import com.r3corda.core.contracts.AuthenticatedObject
import com.r3corda.core.contracts.CommandData
import com.r3corda.core.contracts.ContractState
import com.r3corda.core.contracts.TransactionForContract
import com.r3corda.core.utilities.loggerFor
import net.corda.core.contracts.AuthenticatedObject
import net.corda.core.contracts.CommandData
import net.corda.core.contracts.ContractState
import net.corda.core.contracts.TransactionForContract
import net.corda.core.utilities.loggerFor
import java.util.*
/**
@ -30,4 +30,4 @@ class FirstComposition<S : ContractState, C : CommandData, K : Any>(val firstCla
}
override fun toString() = "First: ${clauses.toList()}"
}
}

12
core/src/main/kotlin/com/r3corda/core/contracts/clauses/GroupClauseVerifier.kt → core/src/main/kotlin/net/corda/core/core/contracts/clauses/GroupClauseVerifier.kt
View File

@ -1,9 +1,9 @@
package com.r3corda.core.contracts.clauses
package net.corda.core.contracts.clauses
import com.r3corda.core.contracts.AuthenticatedObject
import com.r3corda.core.contracts.CommandData
import com.r3corda.core.contracts.ContractState
import com.r3corda.core.contracts.TransactionForContract
import net.corda.core.contracts.AuthenticatedObject
import net.corda.core.contracts.CommandData
import net.corda.core.contracts.ContractState
import net.corda.core.contracts.TransactionForContract
import java.util.*
abstract class GroupClauseVerifier<S : ContractState, C : CommandData, K : Any>(val clause: Clause<S, C, K>) : Clause<ContractState, C, Unit>() {
@ -26,4 +26,4 @@ abstract class GroupClauseVerifier<S : ContractState, C : CommandData, K : Any>(
return matchedCommands
}
}
}

2
core/src/main/kotlin/com/r3corda/core/math/Interpolators.kt → core/src/main/kotlin/net/corda/core/core/math/Interpolators.kt
View File

@ -1,4 +1,4 @@
package com.r3corda.core.math
package net.corda.core.math
import java.util.*

14
core/src/main/kotlin/com/r3corda/core/messaging/Messaging.kt → core/src/main/kotlin/net/corda/core/core/messaging/Messaging.kt
View File

@ -1,12 +1,12 @@
package com.r3corda.core.messaging
package net.corda.core.messaging
import com.google.common.util.concurrent.ListenableFuture
import com.google.common.util.concurrent.SettableFuture
import com.r3corda.core.catch
import com.r3corda.core.node.services.DEFAULT_SESSION_ID
import com.r3corda.core.serialization.DeserializeAsKotlinObjectDef
import com.r3corda.core.serialization.deserialize
import com.r3corda.core.serialization.serialize
import net.corda.core.catch
import net.corda.core.node.services.DEFAULT_SESSION_ID
import net.corda.core.serialization.DeserializeAsKotlinObjectDef
import net.corda.core.serialization.deserialize
import net.corda.core.serialization.serialize
import java.time.Instant
import java.util.*
import java.util.concurrent.atomic.AtomicBoolean
@ -204,4 +204,4 @@ interface AllPossibleRecipients : MessageRecipients
* A general Ack message that conveys no content other than it's presence for use when you want an acknowledgement
* from a recipient. Using [Unit] can be ambiguous as it is similar to [Void] and so could mean no response.
*/
object Ack : DeserializeAsKotlinObjectDef
object Ack : DeserializeAsKotlinObjectDef

6
core/src/main/kotlin/com/r3corda/core/node/AttachmentsClassLoader.kt → core/src/main/kotlin/net/corda/core/core/node/AttachmentsClassLoader.kt
View File

@ -1,7 +1,7 @@
package com.r3corda.core.node
package net.corda.core.node
import com.r3corda.core.contracts.Attachment
import com.r3corda.core.crypto.SecureHash
import net.corda.core.contracts.Attachment
import net.corda.core.crypto.SecureHash
import java.io.ByteArrayInputStream
import java.io.ByteArrayOutputStream
import java.io.FileNotFoundException

4
core/src/main/kotlin/com/r3corda/core/node/CordaPluginRegistry.kt → core/src/main/kotlin/net/corda/core/core/node/CordaPluginRegistry.kt
View File

@ -1,7 +1,7 @@
package com.r3corda.core.node
package net.corda.core.node
/**
* Implement this interface on a class advertised in a META-INF/services/com.r3corda.core.node.CordaPluginRegistry file
* Implement this interface on a class advertised in a META-INF/services/net.corda.core.node.CordaPluginRegistry file
* to extend a Corda node with additional application services.
*/
abstract class CordaPluginRegistry {

12
core/src/main/kotlin/com/r3corda/core/node/NodeInfo.kt → core/src/main/kotlin/net/corda/core/core/node/NodeInfo.kt
View File

@ -1,9 +1,9 @@
package com.r3corda.core.node
package net.corda.core.node
import com.r3corda.core.crypto.Party
import com.r3corda.core.messaging.SingleMessageRecipient
import com.r3corda.core.node.services.ServiceInfo
import com.r3corda.core.node.services.ServiceType
import net.corda.core.crypto.Party
import net.corda.core.messaging.SingleMessageRecipient
import net.corda.core.node.services.ServiceInfo
import net.corda.core.node.services.ServiceType
/**
* Information for an advertised service including the service specific identity information.
@ -20,4 +20,4 @@ data class NodeInfo(val address: SingleMessageRecipient,
val physicalLocation: PhysicalLocation? = null) {
val notaryIdentity: Party get() = advertisedServices.single { it.info.type.isNotary() }.identity
fun serviceIdentities(type: ServiceType): List<Party> = advertisedServices.filter { it.info.type.isSubTypeOf(type) }.map { it.identity }
}
}

4
core/src/main/kotlin/com/r3corda/core/node/PhysicalLocationStructures.kt → core/src/main/kotlin/net/corda/core/core/node/PhysicalLocationStructures.kt
View File

@ -1,4 +1,4 @@
package com.r3corda.core.node
package net.corda.core.node
import java.util.*
@ -58,4 +58,4 @@ object CityDatabase {
}
operator fun get(name: String) = cityMap[name.toLowerCase()]
}
}

6
core/src/main/kotlin/com/r3corda/core/node/PluginServiceHub.kt → core/src/main/kotlin/net/corda/core/core/node/PluginServiceHub.kt
View File

@ -1,7 +1,7 @@
package com.r3corda.core.node
package net.corda.core.node
import com.r3corda.core.crypto.Party
import com.r3corda.core.protocols.ProtocolLogic
import net.corda.core.crypto.Party
import net.corda.core.protocols.ProtocolLogic
import kotlin.reflect.KClass
/**

18
core/src/main/kotlin/com/r3corda/core/node/ServiceHub.kt → core/src/main/kotlin/net/corda/core/core/node/ServiceHub.kt
View File

@ -1,13 +1,13 @@
package com.r3corda.core.node
package net.corda.core.node
import com.google.common.util.concurrent.ListenableFuture
import com.r3corda.core.transactions.SignedTransaction
import com.r3corda.core.contracts.StateRef
import com.r3corda.core.contracts.TransactionResolutionException
import com.r3corda.core.contracts.TransactionState
import com.r3corda.core.messaging.MessagingService
import com.r3corda.core.node.services.*
import com.r3corda.core.protocols.ProtocolLogic
import net.corda.core.transactions.SignedTransaction
import net.corda.core.contracts.StateRef
import net.corda.core.contracts.TransactionResolutionException
import net.corda.core.contracts.TransactionState
import net.corda.core.messaging.MessagingService
import net.corda.core.node.services.*
import net.corda.core.protocols.ProtocolLogic
import java.security.KeyPair
import java.time.Clock
@ -78,4 +78,4 @@ interface ServiceHub {
*
* @param txs The transactions to record.
*/
fun ServiceHub.recordTransactions(vararg txs: SignedTransaction) = recordTransactions(txs.toList())
fun ServiceHub.recordTransactions(vararg txs: SignedTransaction) = recordTransactions(txs.toList())

6
core/src/main/kotlin/com/r3corda/core/node/services/AttachmentStorage.kt → core/src/main/kotlin/net/corda/core/core/node/services/AttachmentStorage.kt
View File

@ -1,7 +1,7 @@
package com.r3corda.core.node.services
package net.corda.core.node.services
import com.r3corda.core.contracts.Attachment
import com.r3corda.core.crypto.SecureHash
import net.corda.core.contracts.Attachment
import net.corda.core.crypto.SecureHash
import java.io.InputStream
/**

4
core/src/main/kotlin/com/r3corda/core/node/services/IdentityService.kt → core/src/main/kotlin/net/corda/core/core/node/services/IdentityService.kt
View File

@ -1,6 +1,6 @@
package com.r3corda.core.node.services
package net.corda.core.node.services
import com.r3corda.core.crypto.Party
import net.corda.core.crypto.Party
import java.security.PublicKey
/**

12
core/src/main/kotlin/com/r3corda/core/node/services/NetworkMapCache.kt → core/src/main/kotlin/net/corda/core/core/node/services/NetworkMapCache.kt
View File

@ -1,12 +1,12 @@
package com.r3corda.core.node.services
package net.corda.core.node.services
import com.google.common.annotations.VisibleForTesting
import com.google.common.util.concurrent.ListenableFuture
import com.r3corda.core.contracts.Contract
import com.r3corda.core.crypto.Party
import com.r3corda.core.messaging.MessagingService
import com.r3corda.core.messaging.SingleMessageRecipient
import com.r3corda.core.node.NodeInfo
import net.corda.core.contracts.Contract
import net.corda.core.crypto.Party
import net.corda.core.messaging.MessagingService
import net.corda.core.messaging.SingleMessageRecipient
import net.corda.core.node.NodeInfo
import org.slf4j.LoggerFactory
import rx.Observable
import java.security.PublicKey

4
core/src/main/kotlin/com/r3corda/core/node/services/ServiceInfo.kt → core/src/main/kotlin/net/corda/core/core/node/services/ServiceInfo.kt
View File

@ -1,4 +1,4 @@
package com.r3corda.core.node.services
package net.corda.core.node.services
/**
* A container for additional information for an advertised service.
@ -21,4 +21,4 @@ data class ServiceInfo(val type: ServiceType, val name: String? = null) {
override fun toString() = if (name != null) "$type|$name" else type.toString()
}
fun Iterable<ServiceInfo>.containsType(type: ServiceType) = any { it.type == type }
fun Iterable<ServiceInfo>.containsType(type: ServiceType) = any { it.type == type }

6
core/src/main/kotlin/com/r3corda/core/node/services/ServiceType.kt → core/src/main/kotlin/net/corda/core/core/node/services/ServiceType.kt
View File

@ -1,4 +1,4 @@
package com.r3corda.core.node.services
package net.corda.core.node.services
/**
* Identifier for service types a node can expose over the network to other peers. These types are placed into network
@ -28,7 +28,7 @@ sealed class ServiceType(val id: String) {
get() {
val stack = Throwable().stackTrace
val caller = stack.first().className
require(caller.startsWith("com.r3corda.")) { "Corda ServiceType namespace is reserved for Corda core components" }
require(caller.startsWith("net.corda.")) { "Corda ServiceType namespace is reserved for Corda core components" }
return ServiceTypeDirect("corda")
}
@ -52,4 +52,4 @@ sealed class ServiceType(val id: String) {
override fun hashCode(): Int = id.hashCode()
override fun toString(): String = id.toString()
}
}

12
core/src/main/kotlin/com/r3corda/core/node/services/Services.kt → core/src/main/kotlin/net/corda/core/core/node/services/Services.kt
View File

@ -1,12 +1,12 @@
package com.r3corda.core.node.services
package net.corda.core.node.services
import com.google.common.util.concurrent.ListenableFuture
import com.google.common.util.concurrent.SettableFuture
import com.r3corda.core.contracts.*
import com.r3corda.core.crypto.Party
import com.r3corda.core.crypto.SecureHash
import com.r3corda.core.transactions.TransactionBuilder
import com.r3corda.core.transactions.WireTransaction
import net.corda.core.contracts.*
import net.corda.core.crypto.Party
import net.corda.core.crypto.SecureHash
import net.corda.core.transactions.TransactionBuilder
import net.corda.core.transactions.WireTransaction
import rx.Observable
import java.security.KeyPair
import java.security.PrivateKey

6
core/src/main/kotlin/com/r3corda/core/node/services/StateMachineRecordedTransactionMappingStorage.kt → core/src/main/kotlin/net/corda/core/core/node/services/StateMachineRecordedTransactionMappingStorage.kt
View File

@ -1,7 +1,7 @@
package com.r3corda.core.node.services
package net.corda.core.node.services
import com.r3corda.core.crypto.SecureHash
import com.r3corda.core.protocols.StateMachineRunId
import net.corda.core.crypto.SecureHash
import net.corda.core.protocols.StateMachineRunId
import rx.Observable
data class StateMachineTransactionMapping(val stateMachineRunId: StateMachineRunId, val transactionId: SecureHash)

8
core/src/main/kotlin/com/r3corda/core/node/services/TimestampChecker.kt → core/src/main/kotlin/net/corda/core/core/node/services/TimestampChecker.kt
View File

@ -1,8 +1,8 @@
package com.r3corda.core.node.services
package net.corda.core.node.services
import com.r3corda.core.contracts.Timestamp
import com.r3corda.core.seconds
import com.r3corda.core.until
import net.corda.core.contracts.Timestamp
import net.corda.core.seconds
import net.corda.core.until
import java.time.Clock
import java.time.Duration

6
core/src/main/kotlin/com/r3corda/core/node/services/TransactionStorage.kt → core/src/main/kotlin/net/corda/core/core/node/services/TransactionStorage.kt
View File

@ -1,7 +1,7 @@
package com.r3corda.core.node.services
package net.corda.core.node.services
import com.r3corda.core.crypto.SecureHash
import com.r3corda.core.transactions.SignedTransaction
import net.corda.core.crypto.SecureHash
import net.corda.core.transactions.SignedTransaction
import rx.Observable
/**

8
core/src/main/kotlin/com/r3corda/core/node/services/UniquenessProvider.kt → core/src/main/kotlin/net/corda/core/core/node/services/UniquenessProvider.kt
View File

@ -1,8 +1,8 @@
package com.r3corda.core.node.services
package net.corda.core.node.services
import com.r3corda.core.contracts.StateRef
import com.r3corda.core.crypto.Party
import com.r3corda.core.crypto.SecureHash
import net.corda.core.contracts.StateRef
import net.corda.core.crypto.Party
import net.corda.core.crypto.SecureHash
/**
* A service that records input states of the given transaction and provides conflict information

10
core/src/main/kotlin/com/r3corda/core/protocols/ProtocolLogic.kt → core/src/main/kotlin/net/corda/core/core/protocols/ProtocolLogic.kt
View File

@ -1,10 +1,10 @@
package com.r3corda.core.protocols
package net.corda.core.protocols
import co.paralleluniverse.fibers.Suspendable
import com.r3corda.core.crypto.Party
import com.r3corda.core.node.ServiceHub
import com.r3corda.core.utilities.ProgressTracker
import com.r3corda.core.utilities.UntrustworthyData
import net.corda.core.crypto.Party
import net.corda.core.node.ServiceHub
import net.corda.core.utilities.ProgressTracker
import net.corda.core.utilities.UntrustworthyData
import org.slf4j.Logger
import rx.Observable

10
core/src/main/kotlin/com/r3corda/core/protocols/ProtocolLogicRef.kt → core/src/main/kotlin/net/corda/core/core/protocols/ProtocolLogicRef.kt
View File

@ -1,10 +1,10 @@
package com.r3corda.core.protocols
package net.corda.core.protocols
import com.google.common.primitives.Primitives
import com.r3corda.core.contracts.StateRef
import com.r3corda.core.crypto.SecureHash
import com.r3corda.core.serialization.SingletonSerializeAsToken
import com.r3corda.protocols.TwoPartyDealProtocol
import net.corda.core.contracts.StateRef
import net.corda.core.crypto.SecureHash
import net.corda.core.serialization.SingletonSerializeAsToken
import net.corda.protocols.TwoPartyDealProtocol
import java.lang.reflect.ParameterizedType
import java.lang.reflect.Type
import java.time.Duration

10
core/src/main/kotlin/com/r3corda/core/protocols/ProtocolStateMachine.kt → core/src/main/kotlin/net/corda/core/core/protocols/ProtocolStateMachine.kt
View File

@ -1,10 +1,10 @@
package com.r3corda.core.protocols
package net.corda.core.protocols
import co.paralleluniverse.fibers.Suspendable
import com.google.common.util.concurrent.ListenableFuture
import com.r3corda.core.crypto.Party
import com.r3corda.core.node.ServiceHub
import com.r3corda.core.utilities.UntrustworthyData
import net.corda.core.crypto.Party
import net.corda.core.node.ServiceHub
import net.corda.core.utilities.UntrustworthyData
import org.slf4j.Logger
import java.util.*
@ -48,4 +48,4 @@ interface ProtocolStateMachine<R> {
val resultFuture: ListenableFuture<R>
}
class ProtocolSessionException(message: String) : Exception(message)
class ProtocolSessionException(message: String) : Exception(message)

8
core/src/main/kotlin/com/r3corda/core/schemas/PersistentTypes.kt → core/src/main/kotlin/net/corda/core/core/schemas/PersistentTypes.kt
View File

@ -1,8 +1,8 @@
package com.r3corda.core.schemas
package net.corda.core.schemas
import com.r3corda.core.contracts.ContractState
import com.r3corda.core.contracts.StateRef
import com.r3corda.core.serialization.toHexString
import net.corda.core.contracts.ContractState
import net.corda.core.contracts.StateRef
import net.corda.core.serialization.toHexString
import java.io.Serializable
import javax.persistence.Column
import javax.persistence.Embeddable

4
core/src/main/kotlin/com/r3corda/core/serialization/ByteArrays.kt → core/src/main/kotlin/net/corda/core/core/serialization/ByteArrays.kt
View File

@ -1,4 +1,4 @@
package com.r3corda.core.serialization
package net.corda.core.serialization
import com.google.common.io.BaseEncoding
import java.io.ByteArrayInputStream
@ -35,4 +35,4 @@ open class OpaqueBytes(val bits: ByteArray) {
fun ByteArray.opaque(): OpaqueBytes = OpaqueBytes(this)
fun ByteArray.toHexString() = BaseEncoding.base16().encode(this)
fun String.parseAsHex() = BaseEncoding.base16().decode(this)
fun String.parseAsHex() = BaseEncoding.base16().decode(this)

19
core/src/main/kotlin/com/r3corda/core/serialization/Kryo.kt → core/src/main/kotlin/net/corda/core/core/serialization/Kryo.kt
View File

@ -1,4 +1,4 @@
package com.r3corda.core.serialization
package net.corda.core.serialization
import co.paralleluniverse.fibers.Fiber
import co.paralleluniverse.io.serialization.kryo.KryoSerializer
@ -10,16 +10,17 @@ import com.esotericsoftware.kryo.io.Input
import com.esotericsoftware.kryo.io.Output
import com.esotericsoftware.kryo.serializers.JavaSerializer
import com.esotericsoftware.kryo.serializers.MapSerializer
import com.r3corda.core.contracts.*
import com.r3corda.core.crypto.*
import com.r3corda.core.node.AttachmentsClassLoader
import com.r3corda.core.node.services.AttachmentStorage
import com.r3corda.core.transactions.SignedTransaction
import com.r3corda.core.transactions.WireTransaction
import com.r3corda.core.utilities.NonEmptySet
import com.r3corda.core.utilities.NonEmptySetSerializer
import net.corda.core.contracts.*
import net.corda.core.crypto.*
import net.corda.core.node.AttachmentsClassLoader
import net.corda.core.node.services.AttachmentStorage
import net.corda.core.transactions.SignedTransaction
import net.corda.core.transactions.WireTransaction
import net.corda.core.utilities.NonEmptySet
import net.corda.core.utilities.NonEmptySetSerializer
import de.javakaffee.kryoserializers.ArraysAsListSerializer
import de.javakaffee.kryoserializers.guava.*
import net.corda.core.crypto.*
import net.i2p.crypto.eddsa.EdDSAPrivateKey
import net.i2p.crypto.eddsa.EdDSAPublicKey
import net.i2p.crypto.eddsa.spec.EdDSAPrivateKeySpec

2
core/src/main/kotlin/com/r3corda/core/serialization/SerializationToken.kt → core/src/main/kotlin/net/corda/core/core/serialization/SerializationToken.kt
View File

@ -1,4 +1,4 @@
package com.r3corda.core.serialization
package net.corda.core.serialization
import com.esotericsoftware.kryo.Kryo
import com.esotericsoftware.kryo.KryoException

12
core/src/main/kotlin/com/r3corda/core/testing/Generators.kt → core/src/main/kotlin/net/corda/core/core/testing/Generators.kt
View File

@ -1,15 +1,15 @@
package com.r3corda.core.testing
package net.corda.core.testing
import com.pholser.junit.quickcheck.generator.GenerationStatus
import com.pholser.junit.quickcheck.generator.Generator
import com.pholser.junit.quickcheck.generator.java.lang.StringGenerator
import com.pholser.junit.quickcheck.generator.java.util.ArrayListGenerator
import com.pholser.junit.quickcheck.random.SourceOfRandomness
import com.r3corda.core.contracts.*
import com.r3corda.core.crypto.Party
import com.r3corda.core.crypto.SecureHash
import com.r3corda.core.crypto.entropyToKeyPair
import com.r3corda.core.serialization.OpaqueBytes
import net.corda.core.contracts.*
import net.corda.core.crypto.Party
import net.corda.core.crypto.SecureHash
import net.corda.core.crypto.entropyToKeyPair
import net.corda.core.serialization.OpaqueBytes
import java.security.PrivateKey
import java.security.PublicKey
import java.time.Duration

8
core/src/main/kotlin/com/r3corda/core/transactions/BaseTransaction.kt → core/src/main/kotlin/net/corda/core/core/transactions/BaseTransaction.kt
View File

@ -1,7 +1,7 @@
package com.r3corda.core.transactions
package net.corda.core.transactions
import com.r3corda.core.contracts.*
import com.r3corda.core.crypto.Party
import net.corda.core.contracts.*
import net.corda.core.crypto.Party
import java.security.PublicKey
import java.util.*
@ -50,4 +50,4 @@ abstract class BaseTransaction(
timestamp == other.timestamp
override fun hashCode() = Objects.hash(notary, mustSign, type, timestamp)
}
}

10
core/src/main/kotlin/com/r3corda/core/transactions/LedgerTransaction.kt → core/src/main/kotlin/net/corda/core/core/transactions/LedgerTransaction.kt
View File

@ -1,8 +1,8 @@
package com.r3corda.core.transactions
package net.corda.core.transactions
import com.r3corda.core.contracts.*
import com.r3corda.core.crypto.Party
import com.r3corda.core.crypto.SecureHash
import net.corda.core.contracts.*
import net.corda.core.crypto.Party
import net.corda.core.crypto.SecureHash
import java.security.PublicKey
/**
@ -81,4 +81,4 @@ class LedgerTransaction(
result = 31 * result + id.hashCode()
return result
}
}
}

18
core/src/main/kotlin/com/r3corda/core/transactions/MerkleTransaction.kt → core/src/main/kotlin/net/corda/core/core/transactions/MerkleTransaction.kt
View File

@ -1,11 +1,15 @@
package com.r3corda.core.transactions
package net.corda.core.transactions
import com.r3corda.core.contracts.Command
import com.r3corda.core.contracts.ContractState
import com.r3corda.core.contracts.StateRef
import com.r3corda.core.contracts.TransactionState
import com.r3corda.core.crypto.*
import com.r3corda.core.serialization.*
import net.corda.core.contracts.Command
import net.corda.core.contracts.ContractState
import net.corda.core.contracts.StateRef
import net.corda.core.contracts.TransactionState
import net.corda.core.crypto.*
import net.corda.core.serialization.*
import net.corda.core.crypto.MerkleTreeException
import net.corda.core.crypto.PartialMerkleTree
import net.corda.core.crypto.SecureHash
import net.corda.core.crypto.sha256
import java.util.*
/**

16
core/src/main/kotlin/com/r3corda/core/transactions/SignedTransaction.kt → core/src/main/kotlin/net/corda/core/core/transactions/SignedTransaction.kt
View File

@ -1,12 +1,12 @@
package com.r3corda.core.transactions
package net.corda.core.transactions
import com.r3corda.core.contracts.NamedByHash
import com.r3corda.core.contracts.TransactionResolutionException
import com.r3corda.core.crypto.DigitalSignature
import com.r3corda.core.crypto.SecureHash
import com.r3corda.core.crypto.toStringsShort
import com.r3corda.core.node.ServiceHub
import com.r3corda.core.serialization.SerializedBytes
import net.corda.core.contracts.NamedByHash
import net.corda.core.contracts.TransactionResolutionException
import net.corda.core.crypto.DigitalSignature
import net.corda.core.crypto.SecureHash
import net.corda.core.crypto.toStringsShort
import net.corda.core.node.ServiceHub
import net.corda.core.serialization.SerializedBytes
import java.io.FileNotFoundException
import java.security.PublicKey
import java.security.SignatureException

13
core/src/main/kotlin/com/r3corda/core/transactions/TransactionBuilder.kt → core/src/main/kotlin/net/corda/core/core/transactions/TransactionBuilder.kt
View File

@ -1,10 +1,11 @@
package com.r3corda.core.transactions
package net.corda.core.transactions
import com.r3corda.core.contracts.*
import com.r3corda.core.crypto.*
import com.r3corda.core.serialization.serialize
import com.r3corda.core.transactions.SignedTransaction
import com.r3corda.core.transactions.WireTransaction
import net.corda.core.contracts.*
import net.corda.core.crypto.*
import net.corda.core.serialization.serialize
import net.corda.core.transactions.SignedTransaction
import net.corda.core.transactions.WireTransaction
import net.corda.core.crypto.*
import java.security.KeyPair
import java.security.PublicKey
import java.time.Duration

22
core/src/main/kotlin/com/r3corda/core/transactions/WireTransaction.kt → core/src/main/kotlin/net/corda/core/core/transactions/WireTransaction.kt
View File

@ -1,16 +1,16 @@
package com.r3corda.core.transactions
package net.corda.core.transactions
import com.esotericsoftware.kryo.Kryo
import com.r3corda.core.contracts.*
import com.r3corda.core.crypto.Party
import com.r3corda.core.crypto.SecureHash
import com.r3corda.core.indexOfOrThrow
import com.r3corda.core.node.ServiceHub
import com.r3corda.core.serialization.SerializedBytes
import com.r3corda.core.serialization.THREAD_LOCAL_KRYO
import com.r3corda.core.serialization.deserialize
import com.r3corda.core.serialization.serialize
import com.r3corda.core.utilities.Emoji
import net.corda.core.contracts.*
import net.corda.core.crypto.Party
import net.corda.core.crypto.SecureHash
import net.corda.core.indexOfOrThrow
import net.corda.core.node.ServiceHub
import net.corda.core.serialization.SerializedBytes
import net.corda.core.serialization.THREAD_LOCAL_KRYO
import net.corda.core.serialization.deserialize
import net.corda.core.serialization.serialize
import net.corda.core.utilities.Emoji
import java.io.FileNotFoundException
import java.security.PublicKey

8
core/src/main/kotlin/com/r3corda/core/utilities/ApiUtils.kt → core/src/main/kotlin/net/corda/core/core/utilities/ApiUtils.kt
View File

@ -1,8 +1,8 @@
package com.r3corda.core.utilities
package net.corda.core.utilities
import com.r3corda.core.crypto.Party
import com.r3corda.core.crypto.parsePublicKeyBase58
import com.r3corda.core.node.ServiceHub
import net.corda.core.crypto.Party
import net.corda.core.crypto.parsePublicKeyBase58
import net.corda.core.node.ServiceHub
import javax.ws.rs.core.Response
/**

4
core/src/main/kotlin/com/r3corda/core/utilities/Emoji.kt → core/src/main/kotlin/net/corda/core/core/utilities/Emoji.kt
View File

@ -1,4 +1,4 @@
package com.r3corda.core.utilities
package net.corda.core.utilities
/**
* A simple wrapper class that contains icons and support for printing them only when we're connected to a terminal.
@ -41,4 +41,4 @@ object Emoji {
emojiMode.set(null)
}
}
}
}

2
core/src/main/kotlin/com/r3corda/core/utilities/Logging.kt → core/src/main/kotlin/net/corda/core/core/utilities/Logging.kt
View File

@ -1,4 +1,4 @@
package com.r3corda.core.utilities
package net.corda.core.utilities
import org.apache.logging.log4j.Level
import org.apache.logging.log4j.LogManager

4
core/src/main/kotlin/com/r3corda/core/utilities/NonEmptySet.kt → core/src/main/kotlin/net/corda/core/core/utilities/NonEmptySet.kt
View File

@ -1,4 +1,4 @@
package com.r3corda.core.utilities
package net.corda.core.utilities
import com.esotericsoftware.kryo.Kryo
import com.esotericsoftware.kryo.Serializer
@ -112,4 +112,4 @@ object NonEmptySetSerializer : Serializer<NonEmptySet<Any>>() {
for (i in 2..size) { set.add(kryo.readClassAndObject(input)) }
return set
}
}
}

4
core/src/main/kotlin/com/r3corda/core/utilities/ProgressTracker.kt → core/src/main/kotlin/net/corda/core/core/utilities/ProgressTracker.kt
View File

@ -1,6 +1,6 @@
package com.r3corda.core.utilities
package net.corda.core.utilities
import com.r3corda.core.TransientProperty
import net.corda.core.TransientProperty
import rx.Observable
import rx.Subscription
import rx.subjects.BehaviorSubject

10
core/src/main/kotlin/com/r3corda/core/utilities/TestConstants.kt → core/src/main/kotlin/net/corda/core/core/utilities/TestConstants.kt
View File

@ -1,7 +1,11 @@
@file:JvmName("TestConstants")
package com.r3corda.core.utilities
package net.corda.core.utilities
import com.r3corda.core.crypto.*
import net.corda.core.crypto.*
import net.corda.core.crypto.DummyPublicKey
import net.corda.core.crypto.Party
import net.corda.core.crypto.entropyToKeyPair
import net.corda.core.crypto.generateKeyPair
import java.math.BigInteger
import java.security.KeyPair
import java.security.PublicKey
@ -17,4 +21,4 @@ val DUMMY_KEY_1: KeyPair by lazy { generateKeyPair() }
val DUMMY_KEY_2: KeyPair by lazy { generateKeyPair() }
val DUMMY_NOTARY_KEY: KeyPair by lazy { entropyToKeyPair(BigInteger.valueOf(20)) }
val DUMMY_NOTARY: Party get() = Party("Notary Service", DUMMY_NOTARY_KEY.public)
val DUMMY_NOTARY: Party get() = Party("Notary Service", DUMMY_NOTARY_KEY.public)

4
core/src/main/kotlin/com/r3corda/core/utilities/TimeWindow.kt → core/src/main/kotlin/net/corda/core/core/utilities/TimeWindow.kt
View File

@ -1,4 +1,4 @@
package com.r3corda.core.utilities
package net.corda.core.utilities
import java.time.Duration
import java.time.Instant
@ -9,4 +9,4 @@ import java.time.Instant
data class TimeWindow(val start: Instant, val duration: Duration) {
val end: Instant
get() = start + duration
}
}

2
core/src/main/kotlin/com/r3corda/core/utilities/UntrustworthyData.kt → core/src/main/kotlin/net/corda/core/core/utilities/UntrustworthyData.kt
View File

@ -1,4 +1,4 @@
package com.r3corda.core.utilities
package net.corda.core.utilities
/**
* A small utility to approximate taint tracking: if a method gives you back one of these, it means the data came from

4
core/src/main/kotlin/com/r3corda/core/crypto/CryptoUtilities.kt → core/src/main/kotlin/net/corda/core/crypto/CryptoUtilities.kt
View File

@ -1,6 +1,6 @@
package com.r3corda.core.crypto
package net.corda.core.crypto
import com.r3corda.core.serialization.OpaqueBytes
import net.corda.core.serialization.OpaqueBytes
import net.i2p.crypto.eddsa.EdDSAEngine
import net.i2p.crypto.eddsa.EdDSAPrivateKey
import net.i2p.crypto.eddsa.EdDSAPublicKey

6
core/src/main/kotlin/com/r3corda/core/crypto/PartialMerkleTree.kt → core/src/main/kotlin/net/corda/core/crypto/PartialMerkleTree.kt
View File

@ -1,7 +1,7 @@
package com.r3corda.core.crypto
package net.corda.core.crypto
import com.r3corda.core.transactions.MerkleTree
import com.r3corda.core.transactions.hashConcat
import net.corda.core.transactions.MerkleTree
import net.corda.core.transactions.hashConcat
import java.util.*

Some files were not shown because too many files have changed in this diff Show More