92efd82fab
Fix broken test ( #2218 )
2017-12-08 17:27:23 +00:00
0129bbe071
Minor corrections to the V2 cheatsheet.
2017-12-08 17:00:31 +00:00
6c02c91ec7
Removes old network diagram. Consolidates two sections on node naming. Moves contract constraints to API section.
2017-12-08 17:00:08 +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
75ea23d193
Merge pull request #2212 from corda/smallFixs
...
Code tidy up, auto reformat, IntelliJ suggestions
2017-12-08 15:44:06 +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
afdf5fb717
Code tidy up, auto reformat, IntelliJ suggestions
2017-12-08 14:21:30 +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
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
c4d5d3817c
CORDA-553 - Update api checker
...
With the addition of the CordaCustomSerializer class for third part
serializers we need to update the ci reference file
2017-12-07 21:15:33 +00:00
1f7083cd61
CORDA-553 - Review comments
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
6881350493
CORDA-786 - Add whitelist testing for external custom serializers
...
Update Docs
2017-12-07 21:14:45 +00:00
f931b74aec
CORDA-780 / CORDA-786 - Doc updates
2017-12-07 21:13:59 +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
1375084936
CORDA-840: Gradle plugins are now able to be published to artifactory. ( #2203 )
...
Gradle plugins are now able to be published to artifactory.
2017-12-07 17:22:22 +00:00
e0abcda13b
Makes it clearer how to build a JAR. Removes ambiguous deployNodes content.
2017-12-07 16:39:52 +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
4a677815ef
Removing NetworkParametersGenerator as an interface
2017-12-07 10:42:52 +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
8461837f1a
Cleaned up Driver.kt so that only the relevant bits are exposed as public API
2017-12-05 23:52:15 +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
9adf4bfc57
Removes the maxWidth parameter that caused the docsite to not use the full screen width.
2017-12-05 14:23:41 +00:00
426b5eb44a
Adds an example use of pagination.
2017-12-05 10:25:48 +00:00
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
ae3a3444f2
Merge pull request #2154 from corda/kat/feature/enumEvolution2
...
Kat/feature/enum evolution2
2017-12-04 17:07:01 +00:00
f7b87c08d6
Crash dependency upgrade ( #2146 )
2017-12-04 17:05:25 +00:00
1ff0d881b3
CORDA-553 - Better tests for rule breaking changes to enum constants
2017-12-04 15:46:32 +00:00
b6427a3128
remove calls to exitnodes from NodeStartup ( #2080 )
2017-12-04 15:44:18 +00:00
66515d24b5
Merge fixes and fix to attachment demo
2017-12-04 14:35:03 +00:00
ca06132c49
add upstart instructions ( #2171 )
...
* add upstart instructions
* Fixes formatting.
* slightly clearer wording
2017-12-04 14:32:47 +00:00
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
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
d2f66acff7
Use non-static Rx pool when testing. ( #2165 )
2017-12-04 12:41:43 +00:00
e257872445
CORDA-553 - Review Comments
2017-12-04 09:39:16 +00:00
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
d5e3f28303
Removed remaining references to networkMapService
2017-12-01 20:57:58 +00:00
7e044e1124
CORDA-553 - Review comments
2017-12-01 19:15:14 +00:00
32ebd2cc8b
CORDA-553 - Review comments
2017-12-01 16:59:19 +00:00
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
