szymonsztuka
60fca0bf16
Merge Open Source to Enterprise
2017-12-06 11:44:58 +00:00
szymonsztuka
57c6460ddc
Fixes after merge Open Source into Enterprise.
2017-12-06 10:43:09 +00:00
Shams Asari
8461837f1a
Cleaned up Driver.kt so that only the relevant bits are exposed as public API
2017-12-05 23:52:15 +00:00
szymonsztuka
cb43091ff8
Merge Open Source into Enterprise
...
# Resolved conflicts:
# core/src/main/kotlin/net/corda/core/node/services/TransactionStorage.kt
# node/src/integration-test/kotlin/net/corda/node/BootTests.kt
# node/src/integration-test/kotlin/net/corda/node/CordappScanningDriverTest.kt
# node/src/integration-test/kotlin/net/corda/node/NodePerformanceTests.kt
# node/src/integration-test/kotlin/net/corda/node/SSHServerTest.kt
# node/src/integration-test/kotlin/net/corda/node/services/AttachmentLoadingTests.kt
# node/src/integration-test/kotlin/net/corda/test/node/NodeStatePersistenceTests.kt
# node/src/main/kotlin/net/corda/node/Corda.kt
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
# node/src/main/kotlin/net/corda/node/internal/StartedNode.kt
# node/src/test/kotlin/net/corda/node/services/events/NodeSchedulerServiceTest.kt
# samples/attachment-demo/src/integration-test/kotlin/net/corda/attachmentdemo/AttachmentDemoTest.kt
# samples/trader-demo/src/integration-test/kotlin/net/corda/traderdemo/TraderDemoTest.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/NodeTestUtils.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/internal/NodeBasedTest.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
2017-12-05 17:35:54 +00:00
Andrzej Cichocki
b0ebf3d7e0
CORDA-654 Various MockServices refactorings ( #2167 )
...
* Remove MockServices.stateMachineRecordedTransactionMapping which does nothing
* Inline StateLoaderImpl
* Remove unused MockServices
* MockServices well-known identities not needed in a place
* A few things don't need a full-blown ServiceHub
2017-12-05 16:22:53 +00:00
Rick Parker
bc630a0381
Local perftestcordapp cluster using driver ( #154 )
...
* Issue and pay sampler now allows to bypass coin selection.
* Local driver based launch of nodes running perftestcordapp
* Fixed comments.
2017-12-05 15:39:08 +00:00
Andrzej Cichocki
e4d76204c1
Pass some key constants into MockServices. ( #2173 )
2017-12-05 14:50:56 +00:00
cburlinchon
c87f37af3e
ENT-1127 mutual exclusion so a node cannot start if another is running ( #111 )
...
* Dont lock row
* Add config for RunOnceService
* Don't invalidate Hibernate L2 cache on native queries
* Change column names to avoid name clash
2017-12-05 14:46:35 +00:00
Alberto Arri
0c667fe9d3
Renable doorman test ( #156 )
...
Re-enable doorman tests
2017-12-05 14:40:32 +00:00
Joel Dudley
9adf4bfc57
Removes the maxWidth parameter that caused the docsite to not use the full screen width.
2017-12-05 14:23:41 +00:00
Alberto Arri
1a1d5c695c
Add support for TICKET_CREATED to PersistentCertificateRequestStorage ( #143 )
2017-12-05 14:04:12 +00:00
Andras Slemmer
15e36f3b1a
Merge pull request #90 from corda/aslemmer-single-threaded-sm
...
Flow state machine rework
2017-12-05 12:57:25 +00:00
Andras Slemmer
8fb0db1908
SSH test workaround
2017-12-05 12:16:32 +00:00
Andras Slemmer
63027a077d
State machine rewrite
2017-12-05 11:36:20 +00:00
Alberto Arri
10635dfbfd
Disable failing doorman tests, fix is under way ( #155 )
2017-12-05 11:35:57 +00:00
Viktor Kolomeyko
fad29ff1f6
R3NET-546: Improve the way CheckMembership operation is performed ( #140 )
2017-12-05 10:49:57 +00:00
Joel Dudley
426b5eb44a
Adds an example use of pagination.
2017-12-05 10:25:48 +00:00
Patrick Kuo
60bde88777
upgrade dependencies to latest ( #153 )
2017-12-04 23:01:50 +00:00
Shams Asari
4374c32a75
HttpUtils methods now throw an IOException when a request isn't successful, rather than returning a Boolean. This has been the cause of previous bugs as people forget to check for the false case.
2017-12-04 21:50:19 +00:00
Katelyn Baker
ae3a3444f2
Merge pull request #2154 from corda/kat/feature/enumEvolution2
...
Kat/feature/enum evolution2
2017-12-04 17:07:01 +00:00
Maksymilian Pawlak
f7b87c08d6
Crash dependency upgrade ( #2146 )
2017-12-04 17:05:25 +00:00
Katelyn Baker
1ff0d881b3
CORDA-553 - Better tests for rule breaking changes to enum constants
2017-12-04 15:46:32 +00:00
Alberto Arri
b6427a3128
remove calls to exitnodes from NodeStartup ( #2080 )
2017-12-04 15:44:18 +00:00
Shams Asari
66515d24b5
Merge fixes and fix to attachment demo
2017-12-04 14:35:03 +00:00
Ben Abineri
ca06132c49
add upstart instructions ( #2171 )
...
* add upstart instructions
* Fixes formatting.
* slightly clearer wording
2017-12-04 14:32:47 +00:00
Shams Asari
6a1aa59e3e
Merge branch 'master' into shams-merge-master-041217
...
# Conflicts:
# node/src/integration-test/kotlin/net/corda/node/services/DistributedServiceTests.kt
# samples/bank-of-corda-demo/src/main/kotlin/net/corda/bank/BankOfCordaCordform.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/NodeTestUtils.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/internal/NodeBasedTest.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockNode.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/NotarySpec.kt
# verifier/src/integration-test/kotlin/net/corda/verifier/VerifierDriver.kt
2017-12-04 13:39:32 +00:00
Alberto Arri
acd2281b20
ENT-1125 bootstrap root certificate ( #2151 )
...
* ENT-1125 make nodes check that the returned signed certificate from Doorman has the expected root
2017-12-04 12:53:22 +00:00
Andrzej Cichocki
d2f66acff7
Use non-static Rx pool when testing. ( #2165 )
2017-12-04 12:41:43 +00:00
Katelyn Baker
e257872445
CORDA-553 - Review Comments
2017-12-04 09:39:16 +00:00
Shams Asari
5264072752
Renamed n.c.nodeapi.config to n.c.nodeapi.internal.config as that config code is not public API. For the same reason, also moved User into the same internal package.
2017-12-03 17:20:30 +00:00
Clinton
bbe8fce686
Doorman and doorman HSM can now be published to artifactory and maven ( #151 )
...
Doorman and doorman HSM can now be published to artifactory and maven local.
2017-12-01 23:04:29 +00:00
Shams Asari
d5e3f28303
Removed remaining references to networkMapService
2017-12-01 20:57:58 +00:00
Katelyn Baker
7e044e1124
CORDA-553 - Review comments
2017-12-01 19:15:14 +00:00
szymonsztuka
709b3791a3
SQL Azure and SQL Server database integration tests ( #115 )
...
* Integration test are parameterised (extends IntegrationTest) to run against a remote database with 4 db scripts run @BeforeClass, @Before, @After and @AfterClass.
* SQL script for SQL Azure and SQL Server databases and templates of JDBC configuration.
2017-12-01 17:17:51 +00:00
Katelyn Baker
32ebd2cc8b
CORDA-553 - Review comments
2017-12-01 16:59:19 +00:00
Patrick Kuo
d81e4809bb
Upgrade Doorman corda dependencies to 3.0-NETWORKMAP-SNAPSHOT ( #145 )
...
* * change corda dependencies to 3.0-NETWORKMAP_SNAPSHOT
* packages move fix
* update network map corda dependencies to 3.0-NETWORKMAP-20171201.110332-5
* some refactoring and address PR issues
* remove dependency on corda core and test util
* add back testCompile dependency
* add back testCompile dependency
2017-12-01 16:16:07 +00:00
Katarzyna Streich
6958cbbc44
Fix demobench as part of network parameters work ( #2148 )
...
* Fix demobench - network parameters
Demobench uses ServiceIdentityGenerator to pregenerate notary identity
for network parameters.
2017-12-01 16:14:03 +00:00
Clinton
faf6b1d5bd
Added command line flag to set mode ( #130 )
...
Added command line flag to set mode and removed it from the config. This is to provide a programmatic interface to doorman configuration for downstream
projects.
2017-12-01 15:13:41 +00:00
Clinton
7b54b82273
Removed trampoline to allow unzipping by most unzip tools. ( #149 )
2017-12-01 14:46:32 +00:00
Michele Sollecito
1f0571306b
Showcase of closures registered as flows. ( #2162 )
2017-12-01 14:31:52 +00:00
Ben Abineri
9a9eb72179
Merge pull request #2153 from corda/bena-docs-enable-service
...
Docs update: instructions to enable service
2017-12-01 14:10:32 +00:00
szymonsztuka
63fca3e7c9
Merge Open Source to Enterprise (pull request #147 )
2017-12-01 12:28:24 +00:00
Andrzej Cichocki
15f677a2fb
Make rigorousMock callRealMethod by default for concrete methods. ( #2159 )
2017-12-01 10:10:27 +00:00
szymonsztuka
6f288b5833
Merge OS to Enterprise - added note about Enterprise specific Gradle wrapper version
2017-12-01 09:36:14 +00:00
szymonsztuka
07e46ddb3c
Merge OS to Enterprise - fixes after merge: update SQL Server cash query, test in pertestcordapp module, platform version 1
2017-12-01 00:02:11 +00:00
szymonsztuka
2bdd8b681d
Merge OS to Enterprise.
...
Main differences preserved in Enterprise version:
* constants.properties: platform version 1 (OS has 2)
* gradle-wrapper.properties: higher Gradle version gradle-4.3.1 (OS has gradle-4.3)
* Driver.kt - setting system property "user.dir"
2017-11-30 23:54:12 +00:00
Shams Asari
c2731c6797
More merge fixes and moved NodesInfoFilesCopier into internal package
2017-11-30 16:46:32 +00:00
Andrzej Cichocki
10e686bc82
Inline DriverConstants. ( #2156 )
2017-11-30 16:28:58 +00:00
Andrzej Cichocki
a314a6a125
CORDA-654 Simplify TransactionDSL API ( #2152 )
2017-11-30 16:28:44 +00:00
Tudor Malene
5a6f2a19b3
[CORDA-824]: fix resource leak in Cash selection ( #2155 )
...
[CORDA-824]: fix resource leak in Cash selection and some example class
2017-11-30 16:17:18 +00:00
