You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2016/12/10 12:38:41 UTC
[3/8] isis git commit: ISIS-1553: returns a fixed encryption key if
not running in production
ISIS-1553: returns a fixed encryption key if not running in production
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/bca9bfae
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/bca9bfae
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/bca9bfae
Branch: refs/heads/master
Commit: bca9bfaeab8dfed119170aa9128a0b70828ddd2d
Parents: 8b46518
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Dec 9 09:02:00 2016 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Dec 9 09:02:00 2016 +0000
----------------------------------------------------------------------
.../apache/isis/viewer/wicket/viewer/IsisWicketApplication.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/bca9bfae/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
index c40b7d9..6764b94 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
@@ -389,7 +389,9 @@ public class IsisWicketApplication
* app is restarted.
*/
protected String defaultEncryptionKeyIfNotConfigured() {
- return UUID.randomUUID().toString();
+ return getDeploymentCategory().isProduction()
+ ? UUID.randomUUID().toString()
+ : "PrototypingEncryptionKey";
}
private void log(final Set<String> validationErrors) {