szymonsztuka
57c6460ddc
Fixes after merge Open Source into Enterprise.
2017-12-06 10:43:09 +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
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
Andras Slemmer
63027a077d
State machine rewrite
2017-12-05 11:36:20 +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
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
Christian Sailer
456c020575
Merge pull request #141 from corda/christians-jmeter-flows
...
Sampler and configuration for multi node flow in JMeter
2017-11-30 11:05:37 +00:00
Christian Sailer
9e2783732f
Code review: Whitespace
2017-11-30 09:23:06 +00:00
Viktor Kolomeyko
1b5eeaaad0
Create a dedicated Log4J2 file for NodeExplorer and output logging configuration used. ( #2142 )
2017-11-28 17:51:30 +00:00
Christian Sailer
f84be2a86b
Put in correct notary name
2017-11-28 16:50:39 +00:00
Christian Sailer
c82d167296
Order of parameters
2017-11-28 16:49:16 +00:00
Christian Sailer
d9e0aa9068
Add missing constructor parameter
2017-11-28 16:37:14 +00:00
Christian Sailer
277d528849
Fix names in jmx request
2017-11-28 16:33:40 +00:00
Tudor Malene
e8d833c2fe
Merge remote-tracking branch 'open/master' into features/ENT-1153/merge_OS2ENT
...
# Conflicts:
# .idea/compiler.xml
# docs/source/changelog.rst
# node/src/test/kotlin/net/corda/node/services/transactions/DistributedImmutableMapTests.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/NodeTestUtils.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
2017-11-27 16:52:29 +00:00
Christian Sailer
8240f7ba2f
Add second request type
2017-11-27 11:09:51 +00:00
Christian Sailer
2fa39dc7d3
Merge branch 'master' of https://github.com/corda/enterprise into christians-jmeter-flows
2017-11-24 10:05:35 +00:00
Viktor Kolomeyko
c516a4b028
R3NET-546: Business Network PoC work ( #101 )
2017-11-24 09:59:35 +00:00
Rick Parker
ca2267f87f
Tidy up ( #128 )
2017-11-23 17:19:30 +00:00
Christian Sailer
b38036cf67
Merge branch 'master' of https://github.com/corda/enterprise into christians-jmeter-flows
2017-11-23 15:35:03 +00:00
Christian Sailer
936d25db16
Add issue and pay sampler
2017-11-23 15:30:19 +00:00
Rick Parker
3061678305
JMeter tooling for performance cluster ( #110 )
...
* First working version of RPC & JMeter
* Remote JMeter working from single JAR.
* Some clean up. Remote slave via capsule is working.
* Full config of capsule launched JMeter server (was missing functions previously).
* SSH tunnelling utility. Property files per remote host.
* Rename jar to make easier to deploy with wildcard filters.
* Easy all in one launch of UI + SSH tunnels.
* Comment out parties.
* Work around for notary.
* Clean up, renaming etc
* Add some comments and clean up.
* Add some comments and clean up.
* README and fixes.
* Redirect search_paths into a file since it so long and doesn't work on the command line in Windows.
* First working version of RPC & JMeter
* Remote JMeter working from single JAR.
* Some clean up. Remote slave via capsule is working.
* Full config of capsule launched JMeter server (was missing functions previously).
* SSH tunnelling utility. Property files per remote host.
* Easy all in one launch of UI + SSH tunnels.
* Comment out parties.
* Work around for notary.
* Clean up, renaming etc
* Add some comments and clean up.
* Add some comments and clean up.
* README and fixes.
* Reduce the dependencies of the JMeter project by copying (#118 )
one function and listing required explicit dependencies
instead of depending on loadtest
* Tidy up
* Fix ssh for windows (#121 )
* Make ssh tunnels work with Pageant on windows and allow specifying explicit
ssh remote user
* Update comments
2017-11-23 12:17:10 +00:00
Christian Sailer
c1c42c98e4
Make jmeter samplers depend on perftestcordapp rather than finance
2017-11-23 12:03:17 +00:00
Christian Sailer
2b217b6eea
Fix ssh for windows ( #121 )
...
* Make ssh tunnels work with Pageant on windows and allow specifying explicit
ssh remote user
* Update comments
2017-11-23 10:22:12 +00:00
rick.parker
f382639ed8
Tidy up
2017-11-23 10:22:11 +00:00
Christian Sailer
4d19a594d6
Reduce the dependencies of the JMeter project by copying ( #118 )
...
one function and listing required explicit dependencies
instead of depending on loadtest
2017-11-23 10:22:11 +00:00
rick.parker
08d3361381
README and fixes.
2017-11-23 10:22:11 +00:00
rick.parker
6fc981e13d
Add some comments and clean up.
2017-11-23 10:22:11 +00:00
rick.parker
1d5d54e063
Add some comments and clean up.
2017-11-23 10:22:09 +00:00
rick.parker
08577510af
Clean up, renaming etc
2017-11-23 10:22:05 +00:00
rick.parker
fa7c67f34b
Work around for notary.
2017-11-23 10:21:28 +00:00
rick.parker
6a6d84cce4
Comment out parties.
2017-11-23 10:21:28 +00:00
rick.parker
b7fb87ed83
Easy all in one launch of UI + SSH tunnels.
2017-11-23 10:21:26 +00:00
rick.parker
766c0b23d2
SSH tunnelling utility. Property files per remote host.
2017-11-23 10:21:19 +00:00
rick.parker
3b565f52f7
Full config of capsule launched JMeter server (was missing functions previously).
2017-11-23 10:21:15 +00:00
rick.parker
029cc1c2f0
Some clean up. Remote slave via capsule is working.
2017-11-23 10:21:13 +00:00
rick.parker
18cca32d11
Remote JMeter working from single JAR.
2017-11-23 10:20:37 +00:00
rick.parker
39ab188e1b
First working version of RPC & JMeter
2017-11-23 10:19:57 +00:00
rick.parker
a84e9fdb2b
Redirect search_paths into a file since it so long and doesn't work on the command line in Windows.
2017-11-23 10:16:50 +00:00
rick.parker
5c64917f18
README and fixes.
2017-11-23 10:16:49 +00:00
rick.parker
e677946453
Add some comments and clean up.
2017-11-23 10:16:49 +00:00
rick.parker
24ef98e5c4
Add some comments and clean up.
2017-11-23 10:16:49 +00:00
rick.parker
b0a8c3c305
Clean up, renaming etc
2017-11-23 10:16:49 +00:00
rick.parker
c543129408
Work around for notary.
2017-11-23 10:15:51 +00:00
rick.parker
9be3098b60
Comment out parties.
2017-11-23 10:15:51 +00:00
rick.parker
1570ea3b53
Easy all in one launch of UI + SSH tunnels.
2017-11-23 10:15:51 +00:00
rick.parker
2650be356b
Rename jar to make easier to deploy with wildcard filters.
2017-11-23 10:15:51 +00:00
rick.parker
501f6c4a1a
SSH tunnelling utility. Property files per remote host.
2017-11-23 10:15:51 +00:00
rick.parker
b58744b18a
Full config of capsule launched JMeter server (was missing functions previously).
2017-11-23 10:15:50 +00:00
rick.parker
ed898778c8
Some clean up. Remote slave via capsule is working.
2017-11-23 10:15:50 +00:00
rick.parker
6b0291d420
Remote JMeter working from single JAR.
2017-11-23 10:15:50 +00:00
