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 2017/01/09 23:58:08 UTC

[3/6] isis git commit: ISIS-1566: updates docs for datanucleus.connectionPasswordDecrypter

ISIS-1566: updates docs for datanucleus.connectionPasswordDecrypter


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/718cf84c
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/718cf84c
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/718cf84c

Branch: refs/heads/master
Commit: 718cf84c6d99f11cd4a1f8863dac868e07148a28
Parents: 8353a6d
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Jan 9 22:55:12 2017 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Jan 9 22:55:12 2017 +0000

----------------------------------------------------------------------
 .../_ugodn_configuring_using-jndi-data-source.adoc      |  5 ++++-
 .../guides/_ugtst_integ-test-support_bootstrapping.adoc | 12 +++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/718cf84c/adocs/documentation/src/main/asciidoc/guides/_ugodn_configuring_using-jndi-data-source.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ugodn_configuring_using-jndi-data-source.adoc b/adocs/documentation/src/main/asciidoc/guides/_ugodn_configuring_using-jndi-data-source.adoc
index 1ef67c1..f6f9f9f 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_ugodn_configuring_using-jndi-data-source.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_ugodn_configuring_using-jndi-data-source.adoc
@@ -12,7 +12,7 @@ Isis' JDO objectstore can be configured either to connect to the database using
 
 Using a connection pool managed directly by the application (that is, by Apache Isis' JDO objectstore and ultimately by DataNucleus) requires a single set of configuration properties to be specified.
 
-In the `WEB-INF\persistor_datanucleus.properties` file, specify the connection driver, url, username and password.
+In either `WEB-INF\isis.properties` file (or `WEB-INF\persistor.properties`, or `WEB-INF\persistor_datanucleus.properties`), specify the connection driver, url, username and password.
 
 For example:
 
@@ -26,6 +26,9 @@ isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionPassword=
 
 Those configuration properties that start with the prefix `isis.persistor.datanucleus.impl.` are passed through directly to DataNucleus (with the prefix removed).
 
+(As of `1.14.0-SNAPSHOT`) it is also possible to specify the `
+datanucleus.ConnectionPasswordDecrypter
+` property; see the link:http://www.datanucleus.org/products/accessplatform_4_1/persistence_properties.html#ConnectionPasswordDecrypter[DataNucleus documentation] for further details.
 
 
 

http://git-wip-us.apache.org/repos/asf/isis/blob/718cf84c/adocs/documentation/src/main/asciidoc/guides/_ugtst_integ-test-support_bootstrapping.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ugtst_integ-test-support_bootstrapping.adoc b/adocs/documentation/src/main/asciidoc/guides/_ugtst_integ-test-support_bootstrapping.adoc
index a3dd6c7..6c25946 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_ugtst_integ-test-support_bootstrapping.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_ugtst_integ-test-support_bootstrapping.adoc
@@ -182,7 +182,17 @@ To remove a little bit of boilerplate, the `IsisConfigurationForJdoIntegTests` c
 |`isis.persistor.datanucleus.impl.` +
 `javax.jdo.option.ConnectionPassword`
 |<empty string>
-|Password
+|Password, possibly encrypted (see `datanucleus.ConnectionPasswordEncrypter`, below).
+
+|`isis.persistor.datanucleus.impl.` +
+`datanucleus.ConnectionPasswordEncrypter`
+|<empty string>
+|(As of `1.14.0-SNAPSHOT`) specify the `
+ datanucleus.ConnectionPasswordDecrypter
+ ` implementation used to decrypt the password.
+
+See the link:http://www.datanucleus.org/products/accessplatform_4_1/persistence_properties.html#ConnectionPasswordDecrypter[DataNucleus documentation] for further details.
+
 
 |`isis.persistor.datanucleus.impl.` +
 `datanucleus.schema.autoCreateAll`