Rename com.r3corda -> net.corda

build.gradle

@@ -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'

client/src/integration-test/kotlin/net/corda/client/CordaRPCClientTest.kt

@@ -1,10 +1,10 @@
-package com.r3corda.client
+package net.corda.client
 
-import com.r3corda.core.random63BitValue
+import net.corda.core.random63BitValue
-import com.r3corda.node.driver.driver
+import net.corda.node.driver.driver
-import com.r3corda.node.services.User
+import net.corda.node.services.User
-import com.r3corda.node.services.config.configureTestSSL
+import net.corda.node.services.config.configureTestSSL
-import com.r3corda.node.services.messaging.ArtemisMessagingComponent.Companion.toHostAndPort
+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

client/src/integration-test/kotlin/net/corda/client/NodeMonitorModelTest.kt

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

client/src/main/kotlin/net/corda/client/CordaRPCClient.kt

@@ -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 net.corda.client.impl.CordaRPCClientImpl
-import com.r3corda.core.ThreadBox
+import net.corda.core.ThreadBox
-import com.r3corda.node.services.config.NodeSSLConfiguration
+import net.corda.node.services.config.NodeSSLConfiguration
-import com.r3corda.node.services.messaging.ArtemisMessagingComponent
+import net.corda.node.services.messaging.ArtemisMessagingComponent
-import com.r3corda.node.services.messaging.ArtemisMessagingComponent.Companion.CLIENTS_PREFIX
+import net.corda.node.services.messaging.ArtemisMessagingComponent.Companion.CLIENTS_PREFIX
-import com.r3corda.node.services.messaging.CordaRPCOps
+import net.corda.node.services.messaging.CordaRPCOps
-import com.r3corda.node.services.messaging.RPCException
+import net.corda.node.services.messaging.RPCException
-import com.r3corda.node.services.messaging.rpcLog
+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

client/src/main/kotlin/net/corda/client/fxutils/AggregatedList.kt

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

client/src/main/kotlin/net/corda/client/fxutils/AmountBindings.kt

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

client/src/main/kotlin/net/corda/client/fxutils/AssociatedList.kt

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

client/src/main/kotlin/net/corda/client/fxutils/ChosenList.kt

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

client/src/main/kotlin/net/corda/client/fxutils/ConcatenatedList.kt

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

client/src/main/kotlin/net/corda/client/fxutils/FlattenedList.kt

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

client/src/main/kotlin/net/corda/client/fxutils/LeftOuterJoinedMap.kt

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

client/src/main/kotlin/net/corda/client/fxutils/MapValuesList.kt

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

client/src/main/kotlin/net/corda/client/fxutils/MappedList.kt

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

client/src/main/kotlin/net/corda/client/fxutils/ObservableFold.kt

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

client/src/main/kotlin/net/corda/client/fxutils/ObservableUtilities.kt

@@ -1,4 +1,4 @@
-package com.r3corda.client.fxutils
+package net.corda.client.fxutils
 
 import javafx.beans.binding.Bindings
 import javafx.beans.property.ReadOnlyObjectWrapper

client/src/main/kotlin/net/corda/client/fxutils/ReadOnlyBackedObservableMapBase.kt

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

client/src/main/kotlin/net/corda/client/fxutils/ReplayedList.kt

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

client/src/main/kotlin/net/corda/client/impl/CordaRPCClientImpl.kt

@@ -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 net.corda.client.CordaRPCClient
-import com.r3corda.core.ErrorOr
+import net.corda.core.ErrorOr
-import com.r3corda.core.bufferUntilSubscribed
+import net.corda.core.bufferUntilSubscribed
-import com.r3corda.core.random63BitValue
+import net.corda.core.random63BitValue
-import com.r3corda.core.serialization.deserialize
+import net.corda.core.serialization.deserialize
-import com.r3corda.core.serialization.serialize
+import net.corda.core.serialization.serialize
-import com.r3corda.core.utilities.debug
+import net.corda.core.utilities.debug
-import com.r3corda.core.utilities.trace
+import net.corda.core.utilities.trace
-import com.r3corda.node.services.messaging.*
+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

client/src/main/kotlin/net/corda/client/mock/EventGenerator.kt

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

client/src/main/kotlin/net/corda/client/mock/Generator.kt

@@ -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.*
 
 /**

client/src/main/kotlin/net/corda/client/model/ContractStateModel.kt

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

client/src/main/kotlin/net/corda/client/model/ExchangeRateModel.kt

@@ -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.*

client/src/main/kotlin/net/corda/client/model/GatheredTransactionDataModel.kt

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

client/src/main/kotlin/net/corda/client/model/Models.kt

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

client/src/main/kotlin/net/corda/client/model/NetworkIdentityModel.kt

@@ -1,10 +1,10 @@
-package com.r3corda.client.model
+package net.corda.client.model
 
-import com.r3corda.client.fxutils.foldToObservableList
+import net.corda.client.fxutils.foldToObservableList
-import com.r3corda.client.fxutils.map
+import net.corda.client.fxutils.map
-import com.r3corda.core.node.NodeInfo
+import net.corda.core.node.NodeInfo
-import com.r3corda.core.node.services.NetworkMapCache
+import net.corda.core.node.services.NetworkMapCache
-import com.r3corda.node.services.network.NetworkMapService
+import net.corda.node.services.network.NetworkMapService
 import javafx.collections.ObservableList
 import kotlinx.support.jdk8.collections.removeIf
 import java.security.PublicKey

client/src/main/kotlin/net/corda/client/model/NodeMonitorModel.kt

@@ -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 net.corda.client.CordaRPCClient
-import com.r3corda.core.contracts.ClientToServiceCommand
+import net.corda.core.contracts.ClientToServiceCommand
-import com.r3corda.core.node.services.NetworkMapCache
+import net.corda.core.node.services.NetworkMapCache
-import com.r3corda.core.node.services.StateMachineTransactionMapping
+import net.corda.core.node.services.StateMachineTransactionMapping
-import com.r3corda.core.node.services.Vault
+import net.corda.core.node.services.Vault
-import com.r3corda.core.protocols.StateMachineRunId
+import net.corda.core.protocols.StateMachineRunId
-import com.r3corda.core.transactions.SignedTransaction
+import net.corda.core.transactions.SignedTransaction
-import com.r3corda.node.services.config.NodeSSLConfiguration
+import net.corda.node.services.config.NodeSSLConfiguration
-import com.r3corda.node.services.messaging.CordaRPCOps
+import net.corda.node.services.messaging.CordaRPCOps
-import com.r3corda.node.services.messaging.StateMachineInfo
+import net.corda.node.services.messaging.StateMachineInfo
-import com.r3corda.node.services.messaging.StateMachineUpdate
+import net.corda.node.services.messaging.StateMachineUpdate
 import javafx.beans.property.SimpleObjectProperty
 import rx.Observable
 import rx.subjects.PublishSubject

client/src/test/kotlin/net/corda/client/ClientRPCInfrastructureTests.kt

@@ -1,15 +1,15 @@
-package com.r3corda.client
+package net.corda.client
 
-import com.r3corda.client.impl.CordaRPCClientImpl
+import net.corda.client.impl.CordaRPCClientImpl
-import com.r3corda.core.millis
+import net.corda.core.millis
-import com.r3corda.core.random63BitValue
+import net.corda.core.random63BitValue
-import com.r3corda.core.serialization.SerializedBytes
+import net.corda.core.serialization.SerializedBytes
-import com.r3corda.core.utilities.LogHelper
+import net.corda.core.utilities.LogHelper
-import com.r3corda.node.services.RPCUserService
+import net.corda.node.services.RPCUserService
-import com.r3corda.node.services.User
+import net.corda.node.services.User
-import com.r3corda.node.services.messaging.*
+import net.corda.node.services.messaging.*
-import com.r3corda.node.services.messaging.ArtemisMessagingComponent.Companion.RPC_REQUESTS_QUEUE
+import net.corda.node.services.messaging.ArtemisMessagingComponent.Companion.RPC_REQUESTS_QUEUE
-import com.r3corda.node.utilities.AffinityExecutor
+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 {

client/src/test/kotlin/net/corda/client/fxutils/AggregatedListTest.kt

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

client/src/test/kotlin/net/corda/client/fxutils/AssociatedListTest.kt

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

client/src/test/kotlin/net/corda/client/fxutils/ConcatenatedListTest.kt

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

client/src/test/kotlin/net/corda/client/fxutils/FlattenedListTest.kt

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

client/src/test/kotlin/net/corda/client/fxutils/LeftOuterJoinedMapTest.kt

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

client/src/test/kotlin/net/corda/client/fxutils/MappedListTest.kt

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

client/src/test/kotlin/net/corda/client/fxutils/ReplayedListTest.kt

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

client/src/test/kotlin/net/corda/client/fxutils/ReplayedMap.kt

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

config/dev/log4j2.xml

@@ -50,7 +50,7 @@
             <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>

config/test/log4j2.xml

@@ -13,7 +13,7 @@
         <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>

core/src/main/java/net/corda/core/crypto/AddressFormatException.java

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

core/src/main/java/net/corda/core/crypto/Base58.java

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

core/src/main/kotlin/net/corda/core/core/Utils.kt

@@ -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

core/src/main/kotlin/net/corda/core/core/contracts/ClientToServiceCommand.kt

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

core/src/main/kotlin/net/corda/core/core/contracts/ContractsDSL.kt

@@ -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.*
 

core/src/main/kotlin/net/corda/core/core/contracts/DummyContract.kt

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

core/src/main/kotlin/net/corda/core/core/contracts/DummyState.kt

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

core/src/main/kotlin/net/corda/core/core/contracts/FinanceTypes.kt

@@ -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

core/src/main/kotlin/net/corda/core/core/contracts/FungibleAsset.kt

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

core/src/main/kotlin/net/corda/core/core/contracts/Structures.kt

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

core/src/main/kotlin/net/corda/core/core/contracts/TransactionGraphSearch.kt

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

core/src/main/kotlin/net/corda/core/core/contracts/TransactionTypes.kt

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

core/src/main/kotlin/net/corda/core/core/contracts/TransactionVerification.kt

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

core/src/main/kotlin/net/corda/core/core/contracts/clauses/AllComposition.kt

@@ -1,9 +1,9 @@
-package com.r3corda.core.contracts.clauses
+package net.corda.core.contracts.clauses
 
-import com.r3corda.core.contracts.AuthenticatedObject
+import net.corda.core.contracts.AuthenticatedObject
-import com.r3corda.core.contracts.CommandData
+import net.corda.core.contracts.CommandData
-import com.r3corda.core.contracts.ContractState
+import net.corda.core.contracts.ContractState
-import com.r3corda.core.contracts.TransactionForContract
+import net.corda.core.contracts.TransactionForContract
 import java.util.*
 
 /**

core/src/main/kotlin/net/corda/core/core/contracts/clauses/AnyComposition.kt

@@ -1,9 +1,9 @@
-package com.r3corda.core.contracts.clauses
+package net.corda.core.contracts.clauses
 
-import com.r3corda.core.contracts.AuthenticatedObject
+import net.corda.core.contracts.AuthenticatedObject
-import com.r3corda.core.contracts.CommandData
+import net.corda.core.contracts.CommandData
-import com.r3corda.core.contracts.ContractState
+import net.corda.core.contracts.ContractState
-import com.r3corda.core.contracts.TransactionForContract
+import net.corda.core.contracts.TransactionForContract
 import java.util.*
 
 /**

core/src/main/kotlin/net/corda/core/core/contracts/clauses/Clause.kt

@@ -1,10 +1,10 @@
-package com.r3corda.core.contracts.clauses
+package net.corda.core.contracts.clauses
 
-import com.r3corda.core.contracts.AuthenticatedObject
+import net.corda.core.contracts.AuthenticatedObject
-import com.r3corda.core.contracts.CommandData
+import net.corda.core.contracts.CommandData
-import com.r3corda.core.contracts.ContractState
+import net.corda.core.contracts.ContractState
-import com.r3corda.core.contracts.TransactionForContract
+import net.corda.core.contracts.TransactionForContract
-import com.r3corda.core.utilities.loggerFor
+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

core/src/main/kotlin/net/corda/core/core/contracts/clauses/ClauseVerifier.kt

@@ -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.

core/src/main/kotlin/net/corda/core/core/contracts/clauses/CompositeClause.kt

@@ -1,8 +1,8 @@
-package com.r3corda.core.contracts.clauses
+package net.corda.core.contracts.clauses
 
-import com.r3corda.core.contracts.AuthenticatedObject
+import net.corda.core.contracts.AuthenticatedObject
-import com.r3corda.core.contracts.CommandData
+import net.corda.core.contracts.CommandData
-import com.r3corda.core.contracts.ContractState
+import net.corda.core.contracts.ContractState
 
 /**
  * Abstract supertype for clauses which compose other clauses together in some logical manner.

core/src/main/kotlin/net/corda/core/core/contracts/clauses/FilterOn.kt

@@ -1,9 +1,9 @@
-package com.r3corda.core.contracts.clauses
+package net.corda.core.contracts.clauses
 
-import com.r3corda.core.contracts.AuthenticatedObject
+import net.corda.core.contracts.AuthenticatedObject
-import com.r3corda.core.contracts.CommandData
+import net.corda.core.contracts.CommandData
-import com.r3corda.core.contracts.ContractState
+import net.corda.core.contracts.ContractState
-import com.r3corda.core.contracts.TransactionForContract
+import net.corda.core.contracts.TransactionForContract
 
 /**
  * Filter the states that are passed through to the wrapped clause, to restrict them to a specific type.

core/src/main/kotlin/net/corda/core/core/contracts/clauses/FirstComposition.kt

@@ -1,10 +1,10 @@
-package com.r3corda.core.contracts.clauses
+package net.corda.core.contracts.clauses
 
-import com.r3corda.core.contracts.AuthenticatedObject
+import net.corda.core.contracts.AuthenticatedObject
-import com.r3corda.core.contracts.CommandData
+import net.corda.core.contracts.CommandData
-import com.r3corda.core.contracts.ContractState
+import net.corda.core.contracts.ContractState
-import com.r3corda.core.contracts.TransactionForContract
+import net.corda.core.contracts.TransactionForContract
-import com.r3corda.core.utilities.loggerFor
+import net.corda.core.utilities.loggerFor
 import java.util.*
 
 /**

core/src/main/kotlin/net/corda/core/core/contracts/clauses/GroupClauseVerifier.kt

@@ -1,9 +1,9 @@
-package com.r3corda.core.contracts.clauses
+package net.corda.core.contracts.clauses
 
-import com.r3corda.core.contracts.AuthenticatedObject
+import net.corda.core.contracts.AuthenticatedObject
-import com.r3corda.core.contracts.CommandData
+import net.corda.core.contracts.CommandData
-import com.r3corda.core.contracts.ContractState
+import net.corda.core.contracts.ContractState
-import com.r3corda.core.contracts.TransactionForContract
+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>() {

core/src/main/kotlin/net/corda/core/core/math/Interpolators.kt

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

core/src/main/kotlin/net/corda/core/core/messaging/Messaging.kt

@@ -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 net.corda.core.catch
-import com.r3corda.core.node.services.DEFAULT_SESSION_ID
+import net.corda.core.node.services.DEFAULT_SESSION_ID
-import com.r3corda.core.serialization.DeserializeAsKotlinObjectDef
+import net.corda.core.serialization.DeserializeAsKotlinObjectDef
-import com.r3corda.core.serialization.deserialize
+import net.corda.core.serialization.deserialize
-import com.r3corda.core.serialization.serialize
+import net.corda.core.serialization.serialize
 import java.time.Instant
 import java.util.*
 import java.util.concurrent.atomic.AtomicBoolean

core/src/main/kotlin/net/corda/core/core/node/AttachmentsClassLoader.kt

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

core/src/main/kotlin/net/corda/core/core/node/CordaPluginRegistry.kt

@@ -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 {

core/src/main/kotlin/net/corda/core/core/node/NodeInfo.kt

@@ -1,9 +1,9 @@
-package com.r3corda.core.node
+package net.corda.core.node
 
-import com.r3corda.core.crypto.Party
+import net.corda.core.crypto.Party
-import com.r3corda.core.messaging.SingleMessageRecipient
+import net.corda.core.messaging.SingleMessageRecipient
-import com.r3corda.core.node.services.ServiceInfo
+import net.corda.core.node.services.ServiceInfo
-import com.r3corda.core.node.services.ServiceType
+import net.corda.core.node.services.ServiceType
 
 /**
  * Information for an advertised service including the service specific identity information.

core/src/main/kotlin/net/corda/core/core/node/PhysicalLocationStructures.kt

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

core/src/main/kotlin/net/corda/core/core/node/PluginServiceHub.kt

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

core/src/main/kotlin/net/corda/core/core/node/ServiceHub.kt

@@ -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 net.corda.core.transactions.SignedTransaction
-import com.r3corda.core.contracts.StateRef
+import net.corda.core.contracts.StateRef
-import com.r3corda.core.contracts.TransactionResolutionException
+import net.corda.core.contracts.TransactionResolutionException
-import com.r3corda.core.contracts.TransactionState
+import net.corda.core.contracts.TransactionState
-import com.r3corda.core.messaging.MessagingService
+import net.corda.core.messaging.MessagingService
-import com.r3corda.core.node.services.*
+import net.corda.core.node.services.*
-import com.r3corda.core.protocols.ProtocolLogic
+import net.corda.core.protocols.ProtocolLogic
 import java.security.KeyPair
 import java.time.Clock
 

core/src/main/kotlin/net/corda/core/core/node/services/AttachmentStorage.kt

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

core/src/main/kotlin/net/corda/core/core/node/services/IdentityService.kt

@@ -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
 
 /**

core/src/main/kotlin/net/corda/core/core/node/services/NetworkMapCache.kt

@@ -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 net.corda.core.contracts.Contract
-import com.r3corda.core.crypto.Party
+import net.corda.core.crypto.Party
-import com.r3corda.core.messaging.MessagingService
+import net.corda.core.messaging.MessagingService
-import com.r3corda.core.messaging.SingleMessageRecipient
+import net.corda.core.messaging.SingleMessageRecipient
-import com.r3corda.core.node.NodeInfo
+import net.corda.core.node.NodeInfo
 import org.slf4j.LoggerFactory
 import rx.Observable
 import java.security.PublicKey

core/src/main/kotlin/net/corda/core/core/node/services/ServiceInfo.kt

@@ -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.

core/src/main/kotlin/net/corda/core/core/node/services/ServiceType.kt

@@ -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")
             }
 

core/src/main/kotlin/net/corda/core/core/node/services/Services.kt

@@ -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 net.corda.core.contracts.*
-import com.r3corda.core.crypto.Party
+import net.corda.core.crypto.Party
-import com.r3corda.core.crypto.SecureHash
+import net.corda.core.crypto.SecureHash
-import com.r3corda.core.transactions.TransactionBuilder
+import net.corda.core.transactions.TransactionBuilder
-import com.r3corda.core.transactions.WireTransaction
+import net.corda.core.transactions.WireTransaction
 import rx.Observable
 import java.security.KeyPair
 import java.security.PrivateKey

core/src/main/kotlin/net/corda/core/core/node/services/StateMachineRecordedTransactionMappingStorage.kt

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

core/src/main/kotlin/net/corda/core/core/node/services/TimestampChecker.kt

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

core/src/main/kotlin/net/corda/core/core/node/services/TransactionStorage.kt

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

core/src/main/kotlin/net/corda/core/core/node/services/UniquenessProvider.kt

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

core/src/main/kotlin/net/corda/core/core/protocols/ProtocolLogic.kt

@@ -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 net.corda.core.crypto.Party
-import com.r3corda.core.node.ServiceHub
+import net.corda.core.node.ServiceHub
-import com.r3corda.core.utilities.ProgressTracker
+import net.corda.core.utilities.ProgressTracker
-import com.r3corda.core.utilities.UntrustworthyData
+import net.corda.core.utilities.UntrustworthyData
 import org.slf4j.Logger
 import rx.Observable
 

core/src/main/kotlin/net/corda/core/core/protocols/ProtocolLogicRef.kt

@@ -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 net.corda.core.contracts.StateRef
-import com.r3corda.core.crypto.SecureHash
+import net.corda.core.crypto.SecureHash
-import com.r3corda.core.serialization.SingletonSerializeAsToken
+import net.corda.core.serialization.SingletonSerializeAsToken
-import com.r3corda.protocols.TwoPartyDealProtocol
+import net.corda.protocols.TwoPartyDealProtocol
 import java.lang.reflect.ParameterizedType
 import java.lang.reflect.Type
 import java.time.Duration

core/src/main/kotlin/net/corda/core/core/protocols/ProtocolStateMachine.kt

@@ -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 net.corda.core.crypto.Party
-import com.r3corda.core.node.ServiceHub
+import net.corda.core.node.ServiceHub
-import com.r3corda.core.utilities.UntrustworthyData
+import net.corda.core.utilities.UntrustworthyData
 import org.slf4j.Logger
 import java.util.*
 

core/src/main/kotlin/net/corda/core/core/schemas/PersistentTypes.kt

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

core/src/main/kotlin/net/corda/core/core/serialization/ByteArrays.kt

@@ -1,4 +1,4 @@
-package com.r3corda.core.serialization
+package net.corda.core.serialization
 
 import com.google.common.io.BaseEncoding
 import java.io.ByteArrayInputStream

core/src/main/kotlin/net/corda/core/core/serialization/Kryo.kt

@@ -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 net.corda.core.contracts.*
-import com.r3corda.core.crypto.*
+import net.corda.core.crypto.*
-import com.r3corda.core.node.AttachmentsClassLoader
+import net.corda.core.node.AttachmentsClassLoader
-import com.r3corda.core.node.services.AttachmentStorage
+import net.corda.core.node.services.AttachmentStorage
-import com.r3corda.core.transactions.SignedTransaction
+import net.corda.core.transactions.SignedTransaction
-import com.r3corda.core.transactions.WireTransaction
+import net.corda.core.transactions.WireTransaction
-import com.r3corda.core.utilities.NonEmptySet
+import net.corda.core.utilities.NonEmptySet
-import com.r3corda.core.utilities.NonEmptySetSerializer
+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

core/src/main/kotlin/net/corda/core/core/serialization/SerializationToken.kt

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

core/src/main/kotlin/net/corda/core/core/testing/Generators.kt

@@ -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 net.corda.core.contracts.*
-import com.r3corda.core.crypto.Party
+import net.corda.core.crypto.Party
-import com.r3corda.core.crypto.SecureHash
+import net.corda.core.crypto.SecureHash
-import com.r3corda.core.crypto.entropyToKeyPair
+import net.corda.core.crypto.entropyToKeyPair
-import com.r3corda.core.serialization.OpaqueBytes
+import net.corda.core.serialization.OpaqueBytes
 import java.security.PrivateKey
 import java.security.PublicKey
 import java.time.Duration

core/src/main/kotlin/net/corda/core/core/transactions/BaseTransaction.kt

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

core/src/main/kotlin/net/corda/core/core/transactions/LedgerTransaction.kt

@@ -1,8 +1,8 @@
-package com.r3corda.core.transactions
+package net.corda.core.transactions
 
-import com.r3corda.core.contracts.*
+import net.corda.core.contracts.*
-import com.r3corda.core.crypto.Party
+import net.corda.core.crypto.Party
-import com.r3corda.core.crypto.SecureHash
+import net.corda.core.crypto.SecureHash
 import java.security.PublicKey
 
 /**

core/src/main/kotlin/net/corda/core/core/transactions/MerkleTransaction.kt

@@ -1,11 +1,15 @@
-package com.r3corda.core.transactions
+package net.corda.core.transactions
 
-import com.r3corda.core.contracts.Command
+import net.corda.core.contracts.Command
-import com.r3corda.core.contracts.ContractState
+import net.corda.core.contracts.ContractState
-import com.r3corda.core.contracts.StateRef
+import net.corda.core.contracts.StateRef
-import com.r3corda.core.contracts.TransactionState
+import net.corda.core.contracts.TransactionState
-import com.r3corda.core.crypto.*
+import net.corda.core.crypto.*
-import com.r3corda.core.serialization.*
+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.*
 
 /**

core/src/main/kotlin/net/corda/core/core/transactions/SignedTransaction.kt

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

core/src/main/kotlin/net/corda/core/core/transactions/TransactionBuilder.kt

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

core/src/main/kotlin/net/corda/core/core/transactions/WireTransaction.kt

@@ -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 net.corda.core.contracts.*
-import com.r3corda.core.crypto.Party
+import net.corda.core.crypto.Party
-import com.r3corda.core.crypto.SecureHash
+import net.corda.core.crypto.SecureHash
-import com.r3corda.core.indexOfOrThrow
+import net.corda.core.indexOfOrThrow
-import com.r3corda.core.node.ServiceHub
+import net.corda.core.node.ServiceHub
-import com.r3corda.core.serialization.SerializedBytes
+import net.corda.core.serialization.SerializedBytes
-import com.r3corda.core.serialization.THREAD_LOCAL_KRYO
+import net.corda.core.serialization.THREAD_LOCAL_KRYO
-import com.r3corda.core.serialization.deserialize
+import net.corda.core.serialization.deserialize
-import com.r3corda.core.serialization.serialize
+import net.corda.core.serialization.serialize
-import com.r3corda.core.utilities.Emoji
+import net.corda.core.utilities.Emoji
 import java.io.FileNotFoundException
 import java.security.PublicKey
 

core/src/main/kotlin/net/corda/core/core/utilities/ApiUtils.kt

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

core/src/main/kotlin/net/corda/core/core/utilities/Emoji.kt

@@ -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.

core/src/main/kotlin/net/corda/core/core/utilities/Logging.kt

@@ -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

core/src/main/kotlin/net/corda/core/core/utilities/NonEmptySet.kt

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

core/src/main/kotlin/net/corda/core/core/utilities/ProgressTracker.kt

@@ -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

core/src/main/kotlin/net/corda/core/core/utilities/TestConstants.kt

@@ -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

core/src/main/kotlin/net/corda/core/core/utilities/TimeWindow.kt

@@ -1,4 +1,4 @@
-package com.r3corda.core.utilities
+package net.corda.core.utilities
 
 import java.time.Duration
 import java.time.Instant

core/src/main/kotlin/net/corda/core/core/utilities/UntrustworthyData.kt

@@ -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

core/src/main/kotlin/net/corda/core/crypto/CryptoUtilities.kt

@@ -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

core/src/main/kotlin/net/corda/core/crypto/PartialMerkleTree.kt

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