65ccd2318f
Merge pull request #182 from corda/colljos-os-hc02-merge-121217
...
OS -> Enterprise merge for HC02
2017-12-13 15:06:40 +00:00
8bb02c63f0
ENT-1161 Notary load testing flow ( #175 )
2017-12-13 14:34:01 +00:00
4e42fff7d4
Fix broken integration test following rebase from OS master (mostly test utils identity constant redefinitions / renaming)
2017-12-13 12:34:06 +00:00
d1998b2c94
Merge remote-tracking branch 'open-hc02/master' into colljos-os-hc02-merge-121217
2017-12-13 11:02:58 +00:00
806ae05781
Fix broken integration test following rebase from OS/ENT master.
2017-12-13 10:31:38 +00:00
b58e2b89cd
TLS supports K1 and mixed K1-R1-RSA ( #2216 )
2017-12-12 20:08:57 +00:00
c3b9955344
CORDA-716 Fix split packages in testing ( #2232 )
2017-12-12 19:37:01 +00:00
905c8252a6
CORDA-654 Remaining key constants ( #2226 )
2017-12-12 18:03:06 +00:00
898ce8c0aa
Removed non-existent import following merge from OS.
2017-12-12 16:09:32 +00:00
08bbf9061e
Introduce TestIdentity. ( #2217 )
2017-12-12 15:52:05 +00:00
499de12620
Merge remote-tracking branch 'open-hc02/master' into colljos-os-hc02-merge-121217
2017-12-12 11:22:57 +00:00
2dc73ecf3b
Changed logic to check for initial certificate, now using the truststore instead of the .cer file ( #2213 )
2017-12-12 10:39:52 +00:00
1fc200efa7
Add db integration to new tests ( #180 )
2017-12-12 10:17:07 +00:00
6d6393d984
Merge branch 'feature-network-parameters' into shams-merge-feature-network-parameters
2017-12-11 21:10:34 +00:00
d8c7f0ae23
Inline DUMMY_CASH/OBLIGATION_ISSUER. ( #2214 )
2017-12-11 16:17:20 +00:00
544e19e277
CORDA-654 Remove key constants from NodeTestUtils ( #2205 )
...
* DUMMY_NOTARY was hiding in a couple more places
2017-12-11 11:44:01 +00:00
4b5c60637c
Merge pull request #2017 from corda/kat/feature/enableAMQP
...
CORDA-780 - Enable AMQP for P2P and Storage Contexts
2017-12-11 11:37:16 +00:00
120fd8fdd9
Fixed compilation errors following DriverDSL refactor.
2017-12-11 11:04:40 +00:00
d6054e4b4f
Merge branch 'master' into shams-master-merge-081217
...
# Conflicts:
# node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/internal/DriverDSLImpl.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/internal/RPCDriver.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/internal/demorun/DemoRunner.kt
# verifier/src/integration-test/kotlin/net/corda/verifier/VerifierDriver.kt
2017-12-11 10:23:16 +00:00
8a6e9c52f3
Merge remote-tracking branch 'open-hc01/master' into colljos-os-hc01-merge-111217
2017-12-11 09:21:52 +00:00
da38e6f673
Configurable authorization/authentication data sources [CORDA-827] ( #2145 )
...
* Add support for external data source of access control data (RPC/Shell users credential and permissions), with optional in-memory caching.
* Support password encoded with Apache Shiro fully reversible Modular Crypt Format.
* Introduce 'security' field in Node configuration and related docsite page.
2017-12-11 08:39:09 +00:00
41bfd7a971
Merge fixes
2017-12-10 20:15:33 +00:00
991c59e753
Stop granting NODE_USER full RPC permissions ( #2098 )
2017-12-08 18:03:57 +00:00
92efd82fab
Fix broken test ( #2218 )
2017-12-08 17:27:23 +00:00
4762569200
CORDA-822 - JMX Jolokia instrumentation ( #2197 )
...
* JMX Jolokia instrumentation WIP (driverDSL, webserver, cordformation, hibernate statistics, access policy config file hardening)
* Cordformation changes to support jolokia agent instrumentation at JVM startup.
* Minor updates to reflect usage of Jolokia 1.3.7 (which uses slightly different .war naming)
* Use relative path reference in -javaagent to prevent problem with long path names with spaces.
* Fixed incorrect regex pattern and added assertion to test.
* Enable JMX monitoring.
* Reporting of Hibernate JMX statistics is configurable (by default, only switched on in devMode)
* Make Artemis JMX enablement configurable.
* Re-instate banning of java serialization.
* Improve JUnit.
* Fixes following rebase from master.
* Re-instated correct regex for picking up Jolokia agent jar.
* Fixed broken integration test.
* Updated documentation
* Updated following PR review feedback.
* Fixed compilation error caused by change in DriverDSL argument type.
* Fixed compilation error caused by change in DriverDSL argument type.
* Fail fast if jolokia-agent-jvm.jar is not located.
* Applied changes in cordformation following review feedback from CA.
2017-12-08 16:27:12 +00:00
65ff931f53
Merge branch 'master' into shams-master-merge-081217
...
# Conflicts:
# node-api/src/main/kotlin/net/corda/nodeapi/internal/crypto/KeyStoreWrapper.kt
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
# node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt
# node/src/test/kotlin/net/corda/node/services/identity/InMemoryIdentityServiceTests.kt
# node/src/test/kotlin/net/corda/node/services/identity/PersistentIdentityServiceTests.kt
# samples/irs-demo/src/integration-test/kotlin/net/corda/test/spring/SpringDriver.kt
# testing/node-driver/src/integration-test/kotlin/net/corda/testing/driver/DriverTests.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/driver/DriverDSL.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/internal/DriverDSLImpl.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/internal/NodeBasedTest.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/internal/RPCDriver.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/internal/demorun/DemoRunner.kt
# testing/test-utils/src/main/kotlin/net/corda/testing/CoreTestUtils.kt
# verifier/src/integration-test/kotlin/net/corda/verifier/VerifierDriver.kt
2017-12-08 16:03:16 +00:00
c396842b0e
CORDA-553 - Review comments
2017-12-08 14:37:41 +00:00
9b097aa988
CORDA-819 Add checks to ensure TLS and Client CA cert chains to the same trusted root ( #2149 )
...
* testnet bad node info bug fix
* address PR issues
* fix PR issues
* remove TODO for checking validation logic
2017-12-08 14:35:49 +00:00
7c5a328cc1
Create a single NodeInfo ( #2174 )
2017-12-08 14:16:06 +00:00
db9eb8a63f
Preliminary work to make merge with master manageable
2017-12-08 13:39:05 +00:00
e6adbe7137
CORDA-831: Add confidential identity certificate type ( #2198 )
...
* Rename certificate types
* Create separate certificate type for confidential identities
* Add name constraints to dev node CA
* Move dev node CA into getTestPartyAndCertificate()
2017-12-08 13:17:29 +00:00
32ea59d085
Inline some DUMMY constants. ( #2200 )
2017-12-08 10:45:22 +00:00
c794f8418c
Merge pull request #162 from corda/aslemmer-fix-netty-buffer-leak
...
Aslemmer fix netty buffer leak
2017-12-08 10:12:35 +00:00
8878fa99a0
CORDA-553 - Remove CordaCustomSerializer annotation
...
It isn't actually needed as we can scan the jar for classes implementing
the interface.
2017-12-07 21:15:33 +00:00
fcec60e232
CORDA-786 - Use reflection to infer proxy and proxied types in CorDapp custom serializers
...
This removes any need for the user implement and override types from the
super class
* CORDA-786 - Docs update
* CORDA-786 - Remove unneeded second annotation on the proxy objects
* Fix merge conflicts
2017-12-07 21:15:14 +00:00
d25b7f560c
CORDA-786 - Genericise the CorDapp Proxy
2017-12-07 21:15:14 +00:00
81eb0c1898
CORDA-780 / CORDA-786 - Enable AMQP for P2P and Storage Contexts
...
Add plugable mechanism for CorDapps such that they can add their own
custom serializers
2017-12-07 21:13:59 +00:00
ce859178eb
Correct identities passed to generateSpend ( #2199 )
...
Pass well known identities instead of confidential into `generateSpend()`
2017-12-07 18:12:25 +00:00
737cd7edba
Improved SQL test setup for Azure SQL and SQL Server ( #152 )
...
* Improved SQL scripts for SQL Server and Azure to drop user/permissions on class setup not on test setup
* Set Micorsoft JDBC driver as compile time dependency.
* Database testing description.
* New table node_mutual_exclusion added to SQL test setup scripts.
2017-12-07 16:26:17 +00:00
bb5d5d6944
Various modifications to debugging tools
2017-12-07 15:35:28 +00:00
fcdb669042
Fix leak by executing acks on the messaging executor
2017-12-07 15:35:28 +00:00
c36bea3af5
CORDA-654 MockServices no longer has hard-coded identities ( #2192 )
...
* Resurrect a test
* Fix a broken test
* Pass in the initial identity
* Make IdentityService easier to mock
2017-12-07 11:55:18 +00:00
cb11379d98
Addressing some of the technical debt
2017-12-06 22:01:41 +00:00
eb3b816d90
Rename NetworkisRegistrationHelperTest to NetworkRegistrationHelperTest ( #2185 )
2017-12-06 14:36:09 +00:00
89256a7f16
Moved the CZ URL and node registration logic of the driver to be more internal, not available through the standard driver call, as these are not testing features for an app dev.
...
Also cleanup up some of the related tests.
2017-12-06 12:32:41 +00:00
57c6460ddc
Fixes after merge Open Source into Enterprise.
2017-12-06 10:43:09 +00:00
8461837f1a
Cleaned up Driver.kt so that only the relevant bits are exposed as public API
2017-12-05 23:52:15 +00:00
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
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
e4d76204c1
Pass some key constants into MockServices. ( #2173 )
2017-12-05 14:50:56 +00:00
