szymonsztuka
b106af63eb
Merge pull request #526 from corda/merges/CORDA-792
...
Merge up from OS master including Standalone Shell and changes..
2018-03-07 19:02:25 +00:00
szymonsztuka
d6efff7ee8
Post merge - added copyrights to new files.
2018-03-07 16:52:06 +00:00
szymonsztuka
3733e7d715
Merge remote-tracking branch 'remotes/open/master' into merges/CORDA-792
...
# Conflicts:
# .idea/compiler.xml
# build.gradle
# node/src/integration-test/kotlin/net/corda/node/services/rpc/RpcSslTest.kt
# node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt
# node/src/main/kotlin/net/corda/node/shell/CordaAuthenticationPlugin.kt
# node/src/main/kotlin/net/corda/node/shell/CordaSSHAuthInfo.kt
# node/src/main/kotlin/net/corda/node/shell/RPCOpsWithContext.kt
# node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
# settings.gradle
# testing/test-common/src/main/kotlin/net/corda/testing/common/internal/UnsafeCertificatesFactory.kt
# tools/shell/src/integration-test/kotlin/net/corda/tools/shell/SSHServerTest.kt
# tools/shell/src/main/java/net/corda/tools/shell/FlowShellCommand.java
# tools/shell/src/main/java/net/corda/tools/shell/RunShellCommand.java
# tools/shell/src/main/java/net/corda/tools/shell/StartShellCommand.java
# tools/shell/src/main/kotlin/net/corda/tools/shell/FlowWatchPrintingSubscriber.kt
# tools/shell/src/main/kotlin/net/corda/tools/shell/InteractiveShell.kt
# tools/shell/src/main/kotlin/net/corda/tools/shell/InteractiveShellCommand.kt
# tools/shell/src/main/kotlin/net/corda/tools/shell/utlities/ANSIProgressRenderer.kt
# tools/shell/src/main/resources/net/corda/tools/shell/base/login.groovy
# tools/shell/src/test/kotlin/net/corda/tools/shell/CustomTypeJsonParsingTests.kt
# tools/shell/src/test/kotlin/net/corda/tools/shell/InteractiveShellTest.kt
2018-03-07 16:49:00 +00:00
Anthony Keenan
84e930d52a
[CORDA-991] - Update committed api from v3 release branch ( #2734 )
...
* Update from v3
* Remove CordaInternal attribute as this is removed by v4 api-scanner plugin
* Make SerializationContext @DoNotImplement
* Addition of CordappConfig to contstructor of CordappContext
* Alteration of getOffset/getSize properties in ByteSequence, OpaqueBytes & OpaqueBytesSubSequence
* Make network parameters on MockServices final
2018-03-07 16:13:16 +00:00
Matthew Nesbit
c63311343b
Merge pull request #524 from corda/mnesbit-merge-20180307
...
Merge up from OS master including Artemis headers whitelisting
2018-03-07 16:04:39 +00:00
Patrick Kuo
feeba03fbf
Regenerate liquidBase change log ( #518 )
...
* rebase liquidBase change log
* * address PR issues
* Better constraint name
* change Varchar to NVarchar
* Removing liquibase migrations for CRR (#525 )
* Removing liquibase migrations for CRR
* Addressing review comments
2018-03-07 16:02:02 +00:00
Katelyn Baker
e6ed91df8b
CORDA-1186 - Move ConstructorForDeserialization out of internal ( #2759 )
...
Since it's a user facing object it shouldn't exist in an internal
package. Move to core to exist with the other serialization annotations
2018-03-07 16:02:01 +00:00
szymonsztuka
0d5f033aae
[CORDA-1085] Alter column names to be consistent with R3.Corda. ( #2606 )
...
Alter column names to be consistent with R3.Corda - related to CORDA-990.
2018-03-07 13:28:49 +00:00
Matthew Nesbit
b6831eed6a
Merge remote-tracking branch 'remotes/open/master' into mnesbit-merge-20180307
...
# Conflicts:
# node/src/main/kotlin/net/corda/node/services/messaging/Messaging.kt
# node/src/main/kotlin/net/corda/node/services/messaging/P2PMessagingClient.kt
# node/src/main/kotlin/net/corda/node/services/statemachine/StateMachineManagerImpl.kt
2018-03-07 11:37:46 +00:00
Michal Kit
6bed95c02b
Certificate Revocation Request - Persistence Layer ( #507 )
...
* Certificate Revocation Request - Persistence Layer
* Addressing review comments
* Addressing review comments
* Adding comments to the requestId field
2018-03-07 11:13:34 +00:00
Matthew Nesbit
2653da9f12
Merge remote-tracking branch 'remotes/open/master' into mnesbit-merge-20180307
...
# Conflicts:
# node/src/main/kotlin/net/corda/node/services/messaging/Messaging.kt
# node/src/main/kotlin/net/corda/node/services/messaging/P2PMessagingClient.kt
# node/src/main/kotlin/net/corda/node/services/statemachine/StateMachineManagerImpl.kt
2018-03-07 11:02:32 +00:00
Shams Asari
4e5df2f4fb
Fix permissioning doc ( #2755 )
2018-03-07 10:39:03 +00:00
szymonsztuka
72074c76c7
[CORDA-792] Standalone Shell ( #2663 )
...
- Existing embedded Shell connects via RPC including checking RPC user credentials (before was a direct use of CordaRPCOps): in dev mode when console terminal is enabled, node created `shell` user.
- New Standalone Shell app with the same functionalities as Shell: connects to a node via RPC Client, can use SSL and run SSH server.
2018-03-07 09:57:32 +00:00
Tudor Malene
8fe94bca2d
ENT-1575 Shorten table name ( #2750 )
2018-03-07 09:55:41 +00:00
Matthew Nesbit
519644ce0d
CORDA-1170: Define and whitelist the Artemis/AMQP application headers that are accepted by Corda ( #2728 )
...
* Whitelist headers copied across bridges
* Address PR comments
2018-03-07 08:56:58 +00:00
Chris Rankin
1ce4805c6d
Merge pull request #522 from corda/chrisr3-os-merge
...
Merge update to API Scanner 4.0.6
2018-03-07 08:55:54 +00:00
Chris Rankin
2cf00ea671
Merge commit 'f6825033' into chrisr3-os-merge
2018-03-06 20:15:35 +00:00
Michele Sollecito
2a5ef62eed
Merge pull request #520 from corda/merges/march-6-16-56
...
Merge: 06/03/2018 at 16:56
2018-03-06 18:58:48 +00:00
Chris Rankin
f682503396
Sort field annotations in public API and remove unnecessary @JvmField. ( #2752 )
2018-03-06 18:12:04 +00:00
Michele Sollecito
da1afd9c55
Introduced copyright in all source files. ( #519 )
2018-03-06 17:29:21 +00:00
sollecitom
906dae11ad
Merge remote-tracking branch 'remotes/open/master' into merges/march-6-16-56
...
# Conflicts:
# node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
2018-03-06 16:59:13 +00:00
Michele Sollecito
f483763249
Fixed unrecognized property jarDirs in node configuration. ( #2748 )
2018-03-06 16:54:01 +00:00
igor nitto
f109c170ad
PluginRegistrationTest update ( #517 )
2018-03-06 15:56:09 +00:00
Chris Rankin
2652dfce3f
Support for creating and joining Java threads within SGX Avian. ( #123 )
...
* Add threading support to SGX Avian.
* Handle contract verification exceptions using uncaught exception handler.
* Indent uniformly to 4 spaces.
* Add comments for some of the uses of SGX synchronisation primitives.
2018-03-06 15:45:44 +00:00
Tudor Malene
ad4bed779d
Merge pull request #515 from corda/merge/tudor_network_bootstrap
...
Merge/tudor network bootstrap
2018-03-06 15:15:00 +00:00
Chris Rankin
727f2b6cd1
Disable empty jar in top-level buildSrc project. ( #2745 )
2018-03-06 15:03:10 +00:00
Andrzej Cichocki
00c171cd61
CORDA-973 Turn on compression for checkpoints and tx storage ( #490 )
2018-03-06 15:01:30 +00:00
Katarzyna Streich
e4d2155671
Add version logging to hsm signing service ( #502 )
...
Add version logging to hsm signing service
2018-03-06 14:56:05 +00:00
Konstantinos Chalkias
4121f70da3
CORDA-1175 Docs numbering issue and counterparty consistency. ( #2744 )
2018-03-06 14:22:38 +00:00
Tudor Malene
549d271047
fix merge
2018-03-06 14:04:23 +00:00
Christian Sailer
d79e365a5b
Jmeter ssh tunnel properties for the new perf cluster ( #513 )
2018-03-06 12:06:41 +00:00
tudor.malene@gmail.com
98a4fe1ce3
Merge remote-tracking branch 'open/master' into merge/tudor_network_bootstrap
...
# Conflicts:
# node/src/integration-test/kotlin/net/corda/node/amqp/AMQPBridgeTest.kt
2018-03-06 11:37:30 +00:00
Konstantinos Chalkias
65bfc833d3
CORDA-1173 - SwapIdentityFlow doc fixes ( #2740 )
2018-03-06 11:12:25 +00:00
Chris Rankin
24e08f9950
Merge pull request #514 from corda/os-merge-050318
...
O/S merge 050318
2018-03-06 11:09:08 +00:00
Matthew Nesbit
81f4bbcaf3
Fix flaky bridge test and an associated deadlock during rollback in the BridgeManager code. ( #2739 )
2018-03-06 10:49:29 +00:00
Konstantinos Chalkias
f1856f0146
CORDA-1145 - troubleshooting updates ( #2738 )
2018-03-06 10:28:10 +00:00
Michele Sollecito
6479d7d8ff
[CORDA-1156]: Output of run networkMapFeed and run networkMapSnapshot not consistent in shell (fixed) ( #2733 )
2018-03-06 10:15:17 +00:00
Chris Rankin
596edcc2ae
Merge commit '29ccd4d' into os-merge-050318
2018-03-05 23:21:35 +00:00
Chris Rankin
2462188b9b
[CORDA-1162] Write API class/interface/method annotations in ascending order.
2018-03-05 23:03:59 +00:00
Chris Rankin
c9616cb15e
[CORDA-1148] Include all of the vararg methods in our public API.
2018-03-05 23:02:05 +00:00
Tudor Malene
3a247f2966
CORDA-1147 - fix shell ( #2730 ) ( #2737 )
2018-03-05 19:11:04 +00:00
Tudor Malene
5efea22a9b
Network Bootstrap changes to master ( #2736 )
...
* Added exclude whitelist to Network Bootstrapper to enable fine grained testing (#2666 )
* Added exclude whitelist to Network Bootstrapper to enable fine grained testing.
* code review change
(cherry picked from commit d4f9b10#2721 )
* CORDA-1150 better log messages
* CORDA-1150 better log messages
* CORDA-1150 better log messages
(cherry picked from commit 87c5ad8
2018-03-05 19:10:48 +00:00
Katelyn Baker
d116b5e9f4
CORDA-1140 - FOR RPC Client P2P context use AMQP ( #2716 )
...
* CORDA-1140 - FOR RPC Client P2P context use AMQP
* Review comments
* Review comments
* review comments
* review comments
2018-03-05 18:05:32 +00:00
Andrzej Cichocki
29ccd4dbb8
CORDA-1131 Upgrade plugins to 4.0.5 ( #2725 )
2018-03-05 17:38:32 +00:00
Shams Asari
84ff1c875a
CORDA-1006: Undoing the wiring of maxMessageSize as it's not correctly implemented and updating the docs to clarify its status. ( #2501 ) ( #2729 )
...
The network parameter was just fed into Artemis' minLargeMessageSize property which isn't the same thing.
(cherry picked from commit 49f75da
2018-03-05 17:26:08 +00:00
Chris Rankin
382b424810
Merge pull request #2727 from corda/chrisr3-vararg-apis
...
Fix public API definition for Gradle Plugin 4.0.4
2018-03-05 16:43:40 +00:00
igor nitto
1caca44076
Fixed smoke tests after config parsing changes [CORDA-926]
2018-03-05 15:32:05 +00:00
Andrzej Cichocki
1470f294d4
Add artifactory as repo for TC-published gradle plugins (and cordform-common).
2018-03-05 15:15:37 +00:00
Anthony Keenan
cd3beabcc0
Finalise API stabilty
2018-03-05 14:34:18 +00:00
Andrius Dagys
37de2e770e
CORDA-696: Contract upgrade transactions - handle WhitelistedByZoneAttachmentConstraint for input state constraint verification
2018-03-05 14:34:18 +00:00
