Chris Rankin
a10323ed0f
Merge commit 'df4699c69abc8aab7e1e44b602c762212cbf93f6' into chrisr3-os-merge
2018-09-17 14:01:09 +01:00
Chris Rankin
df4699c69a
CORDA-1985: Configure Gradle capsule plugin to use Capsule 1.0.3. ( #3949 )
2018-09-17 13:55:31 +01:00
Anthony Keenan
230d91046c
Merge commit '20cd4539d637676ac55457fc7fe4df2ce8dacff8' into anthony-os-merge-20180906
...
# Conflicts:
# node/capsule/build.gradle
2018-09-06 16:03:39 +01:00
Chris Rankin
ca9649ec0f
CORDA-1964: Upgrade to Gradle 4.10 ( #3903 )
2018-09-06 12:48:31 +01:00
Michele Sollecito
fbaa31e9d2
Merge remote-tracking branch 'open/master' into os_ent_merges/CORDA-1937
...
# Conflicts:
# client/rpc/src/main/kotlin/net/corda/client/rpc/internal/CordaRPCClientUtils.kt
# core/src/main/kotlin/net/corda/core/internal/InternalUtils.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/ArtemisMessagingClient.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/bridging/AMQPBridgeManager.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/bridging/BridgeControlListener.kt
# node/src/integration-test/kotlin/net/corda/node/NodeKeystoreCheckTest.kt
# node/src/integration-test/kotlin/net/corda/node/amqp/AMQPBridgeTest.kt
# node/src/integration-test/kotlin/net/corda/node/amqp/ProtonWrapperTests.kt
# node/src/integration-test/kotlin/net/corda/node/services/network/NetworkMapTest.kt
# node/src/integration-test/kotlin/net/corda/services/messaging/MQSecurityTest.kt
# node/src/main/kotlin/net/corda/node/internal/Node.kt
# node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
2018-09-04 11:07:50 +01:00
Michele Sollecito
d01dd22419
[CORDA-1937]: Refactor NodeConfiguration hierarchy. ( #3856 )
2018-09-04 10:26:10 +01:00
Shams Asari
11e2bef240
ENT-2473: Removed copyright headers ( #1364 )
2018-09-03 16:38:52 +01:00
Chris Rankin
a287673432
Merge commit 'ff62df8d5a0ab9eabfe919b65a8c73baa3dca7f3' into chrisr3-os-merge
...
Conflicts:
finance/src/main/kotlin/net/corda/finance/contracts/asset/cash/selection/CashSelectionSQLServerImpl.kt
node/src/main/kotlin/net/corda/node/NodeArgsParser.kt
node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt
node/src/main/kotlin/net/corda/node/services/vault/NodeVaultService.kt
2018-08-20 15:46:20 +01:00
Chris Rankin
911aa1381b
CORDA-1906: Add Servlet 3.1 implementation into the WebServer. ( #3794 )
2018-08-17 14:08:48 +01:00
rick.parker
237c133804
Merge remote-tracking branch 'remotes/open/master' into parkri-os-merge-20180814-1
...
# Conflicts:
# CONTRIBUTORS.md
# constants.properties
# docs/source/index.rst
# docs/source/upgrading-cordapps.rst
# node/build.gradle
2018-08-14 11:26:52 +01:00
Michele Sollecito
3b63723934
[CORDA-1822]: Improved error message when too many results are asked with default pagination. ( #3776 )
2018-08-13 16:50:29 +01:00
Thomas Schroeter
baabf8ceb9
Merge remote-tracking branch 'open-source/master' into thomas/os-merge-2018-07-11
...
Conflicts:
finance/src/integration-test/kotlin/net/corda/finance/flows/CashConfigDataFlowTest.kt
node/src/integration-test/kotlin/net/corda/node/BootTests.kt
node/src/integration-test/kotlin/net/corda/node/NodeUnloadHandlerTests.kt
node/src/integration-test/kotlin/net/corda/node/flows/FlowRetryTest.kt
tools/shell/src/integration-test/kotlin/net/corda/tools/shell/InteractiveShellIntegrationTest.kt
tools/shell/src/integration-test/kotlin/net/corda/tools/shell/SSHServerTest.kt
webserver/src/integration-test/kotlin/net/corda/webserver/WebserverDriverTests.kt
2018-07-11 14:56:03 +01:00
Shams Asari
2833ec2a88
Avoiding starting notaries in driver-based integration tests to speed them up ( #3544 )
2018-07-11 11:36:36 +01:00
Anthony Keenan
8d7aa5f590
Merge remote-tracking branch 'open/master' into anthony-os-merge-20180710
...
# Conflicts:
# .idea/compiler.xml
# docs/source/changelog.rst
# docs/source/network-bootstrapper.rst
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
# node/src/main/kotlin/net/corda/node/services/identity/IdentityServiceUtil.kt
# node/src/main/kotlin/net/corda/node/services/identity/PersistentIdentityService.kt
2018-07-10 11:19:23 +01:00
Michele Sollecito
54161a630a
[CORDA-1659]: Improve handling/logging of failed address binding. ( #3498 )
2018-07-09 18:45:20 +01:00
Shams Asari
98cd8be160
Merge remote-tracking branch 'open/master' into os-merge-b97af47
...
# Conflicts:
# .idea/compiler.xml
# docs/source/changelog.rst
# docs/source/release-notes.rst
# node/src/main/kotlin/net/corda/node/internal/cordapp/CordappLoader.kt
# tools/bootstrapper/build.gradle
2018-06-25 11:38:30 +01:00
Shams Asari
3046843d40
CORDA-1602: Added cmd line flags to the network bootstrapper ( #3419 )
...
The list of CorDapps jars is no longer passed in via the cmd line but is now expected to be placed in the bootstrapped directory.
Ended up being a bit of a refactor to cater for unit testing, and also tidied up the bootstrapper docs.
2018-06-23 11:36:10 +01:00
sollecitom
bf1b3a37ce
Merge remote-tracking branch 'remotes/open/master' into merges/june-19-16-47
2018-06-19 16:48:12 +01:00
Clinton Alexander
8f2e457f0d
Removed some vestigal jolokia code from the webserver.
2018-06-19 13:49:42 +01:00
sollecitom
ee45c8280d
Merge remote-tracking branch 'remotes/open/master' into merges/may-21-17-24
...
# Conflicts:
# client/rpc/src/main/kotlin/net/corda/client/rpc/PermissionException.kt
2018-05-22 09:51:02 +01:00
bpaunescu
bff419e9af
Corda-1505 catch connection failure exception and re-throw as RPCException ( #3203 )
...
* CORDA-1505: catch connection failure exception and rethrow as RPCException
* CORDA-1443: remove incorrect import
* CORDA-1443: fix some failing tests
* CORDA-1505: fix broken CordaRPCClient test
* fix tests
* CORDA-1505: catch connection failure exception and rethrow as RPCException
* CORDA-1443: remove incorrect import
* CORDA-1443: fix some failing tests
* CORDA-1505: fix broken CordaRPCClient test
* fix tests
* CORDA-1505: changed exception handling to RPCException
* CORDA-1505: changed exception handling to RPCException
2018-05-21 18:01:31 +01:00
sollecitom
9a69a36904
Merge remote-tracking branch 'remotes/open/master' into merges/may-14-15-21
...
# Conflicts:
# .idea/compiler.xml
# constants.properties
# experimental/behave/src/main/kotlin/net/corda/behave/network/Network.kt
# experimental/behave/src/main/kotlin/net/corda/behave/node/Distribution.kt
# experimental/behave/src/test/kotlin/net/corda/behave/service/PostreSQLServiceTests.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/bridging/AMQPBridgeManager.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/CordaPersistence.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/HibernateConfiguration.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/netty/AMQPChannelHandler.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/netty/AMQPClient.kt
# node/src/integration-test/kotlin/net/corda/node/AuthDBTests.kt
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
# node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt
# node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt
# node/src/main/kotlin/net/corda/node/services/messaging/MessagingExecutor.kt
# node/src/main/kotlin/net/corda/node/services/persistence/AbstractPartyToX500NameAsStringConverter.kt
# node/src/main/kotlin/net/corda/node/services/persistence/DBTransactionMappingStorage.kt
# node/src/main/kotlin/net/corda/node/utilities/AddOrRemove.kt
# node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
# samples/attachment-demo/src/integration-test/kotlin/net/corda/attachmentdemo/AttachmentDemoTest.kt
# samples/irs-demo/web/src/test/kotlin/net/corda/irs/web/IrsDemoWebApplicationTests.kt
# samples/simm-valuation-demo/src/integration-test/kotlin/net/corda/vega/SimmValuationTest.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/InternalTestUtils.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/RPCDriver.kt
# testing/smoke-test-utils/src/main/kotlin/net/corda/smoketesting/NodeConfig.kt
# webserver/src/integration-test/kotlin/net/corda/webserver/WebserverDriverTests.kt
2018-05-14 15:56:43 +01:00
Michele Sollecito
d027b5b8f2
[CORDA-1472]: Crackdown on warnings. ( #3136 )
2018-05-14 21:15:52 +07:00
Michal Kit
e5e98f3540
Merge OS commit 'ab80df342ab8a7ede0539daaee9fcecd02f6aeeb' into enterprise
2018-05-03 10:55:40 +01:00
Michal Kit
ab80df342a
CORDA-1319 Adding CRL checking for nodes ( #2987 )
...
* Adding CRL support for nodes
* Addressing review comments
2018-04-30 09:26:26 +01:00
szymonsztuka
05ec885afd
Update integration test setup in database mode after OS->ENT merge ( #732 )
...
Added Notary schema for SQL setup to tests.
Added SQL setup/tearDown to a loop starting the same node few times in DriverTests.
2018-04-13 15:28:07 +01:00
szymonsztuka
b86071c5c5
ENT-1566 Fixes for db integration tests + ENT-1575 db migrations for db attachment changes ( #521 )
...
ENT-1575 Add db migrations for db attachment changes,
ENT-1566 Fixes for db integration tests -following changes in CORDA-926 (obligatory node properties), upgrade db schema setup in draining mode/RPC tests, set runMigration=true in properties files for db tests, add new tables for deletion in SQL setup scrips
Updated db integration tests description in testing.rst
2018-03-09 09:52:44 +00:00
Michele Sollecito
da1afd9c55
Introduced copyright in all source files. ( #519 )
2018-03-06 17:29:21 +00:00
sollecitom
36cd34bff5
Merge remote-tracking branch 'remotes/open/master' into merges/march-1-15-20
...
# Conflicts:
# docs/source/corda-configuration-file.rst
# docs/source/release-notes.rst
# node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt
# node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
# tools/demobench/src/test/kotlin/net/corda/demobench/model/NodeConfigTest.kt
# tools/explorer/README.md
# tools/explorer/src/main/kotlin/net/corda/explorer/ExplorerSimulation.kt
2018-03-01 15:36:40 +00:00
Michele Sollecito
b580a2ac30
[CORDA-926]: Parsing NodeConfiguration will now fail if unknown properties are present. ( #2484 )
2018-03-01 14:57:36 +00:00
Andrius Dagys
cc8e38922e
Merge remote-tracking branch 'open/master' into andrius-merge-02-26
2018-02-26 11:55:17 +00:00
igor nitto
fd491d91ff
WebServer init failure on config produced by plugins >= 4.0.2 [CORDA-877] ( #2624 )
2018-02-23 18:29:49 +00:00
igor nitto
731cb1b67e
Remove unused occurrences of 'exportJMXto' ( #2588 )
2018-02-21 19:05:55 +00:00
Andras Slemmer
25263c20c7
Merge remote-tracking branch 'open/master' into aslemmer-merge-19-Feb
2018-02-20 15:52:09 +00:00
igor nitto
458db7cb24
Cleanup build ( #2551 )
...
* Remove compile-time dependencies on jolokia-war from webserver
* Stop exporting jolokia version to all projects, it is only used by node
2018-02-16 12:17:46 +00:00
Shams Asari
4b86362391
Merge remote-tracking branch 'open/master' into shams-os-merge-250118
...
# Conflicts:
# client/rpc/src/integration-test/kotlin/net/corda/client/rpc/BlacklistKotlinClosureTest.kt
# client/rpc/src/integration-test/kotlin/net/corda/client/rpc/RPCStabilityTests.kt
# core/src/test/java/net/corda/core/flows/FlowsInJavaTest.java
# docs/source/changelog.rst
# docs/source/corda-configuration-file.rst
# docs/source/upgrade-notes.rst
# finance/src/test/kotlin/net/corda/finance/contracts/CommercialPaperTests.kt
# finance/src/test/kotlin/net/corda/finance/contracts/asset/CashTests.kt
# gradle/wrapper/gradle-wrapper.properties
# node-api/src/main/kotlin/net/corda/nodeapi/internal/KeyStoreConfigHelpers.kt
# node-api/src/test/kotlin/net/corda/nodeapi/internal/serialization/SetsSerializationTest.kt
# node/src/integration-test/kotlin/net/corda/node/AuthDBTests.kt
# node/src/integration-test/kotlin/net/corda/node/BootTests.kt
# node/src/integration-test/kotlin/net/corda/node/NodeKeystoreCheckTest.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/node/services/BFTNotaryServiceTests.kt
# node/src/integration-test/kotlin/net/corda/node/services/RaftNotaryServiceTests.kt
# node/src/integration-test/kotlin/net/corda/node/services/network/NetworkMapTest.kt
# node/src/integration-test/kotlin/net/corda/node/services/network/PersistentNetworkMapCacheTest.kt
# node/src/integration-test/kotlin/net/corda/node/services/statemachine/FlowVersioningTest.kt
# node/src/integration-test/kotlin/net/corda/node/utilities/registration/NodeRegistrationTest.kt
# node/src/integration-test/kotlin/net/corda/services/messaging/MQSecurityTest.kt
# node/src/integration-test/kotlin/net/corda/services/messaging/P2PMessagingTest.kt
# node/src/integration-test/kotlin/net/corda/test/node/NodeStatePersistenceTests.kt
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
# node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
# node/src/main/resources/reference.conf
# node/src/test/java/net/corda/node/services/vault/VaultQueryJavaTests.java
# node/src/test/kotlin/net/corda/node/CordaRPCOpsImplTest.kt
# node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
# node/src/test/kotlin/net/corda/node/services/network/NetworkMapCacheTest.kt
# node/src/test/kotlin/net/corda/node/services/persistence/DBCheckpointStorageTests.kt
# samples/attachment-demo/src/integration-test/kotlin/net/corda/attachmentdemo/AttachmentDemoTest.kt
# samples/network-visualiser/src/main/kotlin/net/corda/netmap/NetworkMapVisualiser.kt
# samples/notary-demo/src/main/kotlin/net/corda/notarydemo/RaftNotaryCordform.kt
# samples/simm-valuation-demo/src/integration-test/kotlin/net/corda/vega/SimmValuationTest.kt
# testing/node-driver/src/integration-test/kotlin/net/corda/testing/driver/DriverTests.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/InMemoryMessagingNetwork.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockNode.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/NodeTestUtils.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/NodeBasedTest.kt
# testing/smoke-test-utils/src/main/kotlin/net/corda/smoketesting/NodeProcess.kt
# testing/test-utils/src/main/kotlin/net/corda/testing/internal/TestNodeInfoBuilder.kt
# tools/explorer/src/main/kotlin/net/corda/explorer/ExplorerSimulation.kt
# verifier/src/integration-test/kotlin/net/corda/verifier/VerifierTests.kt
# webserver/src/integration-test/kotlin/net/corda/webserver/WebserverDriverTests.kt
2018-01-25 17:51:13 +00:00
Michele Sollecito
9783f11ba8
Exposed RPC SSL settings through Cordformation ( #2419 )
2018-01-25 14:32:58 +00:00
jamesbr3
5f8af818b1
Merge pull request #2408 from corda/jamesbr-remove-jolokia-war
...
Remove jolokia war reference from webserver
2018-01-24 21:19:50 +00:00
Michele Sollecito
142f52fa82
[CORDA:936]: Enable RPC layer to work with SSL
2018-01-23 16:23:37 +00:00
James Brown
8de2c78dd2
Remove jolokia war reference from webserver
2018-01-22 16:21:28 +00:00
Andrzej Cichocki
1fc646cfa8
CORDA-716 Move test-utils and node-driver to stable API section in docs ( #2335 )
...
* Move test-utils and node-driver to stable section.
* Move FlowStackSnapshotFactory to testing.services package & update docs
* Move SerializationTestHelpers to testing.core package
* Move TestConstants.kt to core namespace
* Move Expect.kt to core namespace
* Move CoreTestUtils to core.TestUtils - rename class and update imports
* Added some clarification to documents after re-reading them
* Added static imports
* Removing unused import
* Fix merge conflict
* Fixing merge conflict
2018-01-22 11:28:41 +00:00
Andrzej Cichocki
42e1a38c6b
Merge commit 'ea57639a378fa45f0aef6930bc4450d0bbfaa5f4' into andr3ej-entbot
...
# Conflicts:
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
2018-01-18 11:15:14 +00:00
Joel Dudley
6e817f014d
Adds default endpoints for the Corda development webserver.
2018-01-17 11:04:37 +00:00
Shams Asari
1e9e1a61d9
Moved IntegrationTest class into internal package
2018-01-04 22:08:16 +00:00
josecoll
bc56a60d4a
Final renaming of invalid constants in Integration tests following rebase from OS master.
2017-12-13 13:10:04 +00:00
josecoll
d1998b2c94
Merge remote-tracking branch 'open-hc02/master' into colljos-os-hc02-merge-121217
2017-12-13 11:02:58 +00:00
Andrzej Cichocki
c3b9955344
CORDA-716 Fix split packages in testing ( #2232 )
2017-12-12 19:37:01 +00:00
Andrzej Cichocki
905c8252a6
CORDA-654 Remaining key constants ( #2226 )
2017-12-12 18:03:06 +00:00
josecoll
8a6e9c52f3
Merge remote-tracking branch 'open-hc01/master' into colljos-os-hc01-merge-111217
2017-12-11 09:21:52 +00:00
josecoll
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