You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by ch...@apache.org on 2014/06/04 20:18:14 UTC
svn commit: r1600409 - /db/derby/docs/trunk/src/devguide/
Author: chaase3
Date: Wed Jun 4 18:18:13 2014
New Revision: 1600409
URL: http://svn.apache.org/r1600409
Log:
DERBY-6217 Put all of the security documentation in a single, separate user
guide
Modified 6 Developer's Guide topics and map file; removed 74 files, consisting
of 62 topics and 4 figures (3 files for each, so 12 files).
Patches: DERBY-6217-dev.diff
Removed:
db/derby/docs/trunk/src/devguide/appauth_os.eps
db/derby/docs/trunk/src/devguide/appauth_os.gif
db/derby/docs/trunk/src/devguide/appauth_os.jpg
db/derby/docs/trunk/src/devguide/authentic_os.eps
db/derby/docs/trunk/src/devguide/authentic_os.gif
db/derby/docs/trunk/src/devguide/authentic_os.jpg
db/derby/docs/trunk/src/devguide/cdevbabejgjd.dita
db/derby/docs/trunk/src/devguide/cdevcbabejdfj.dita
db/derby/docs/trunk/src/devguide/cdevcsecure10983.dita
db/derby/docs/trunk/src/devguide/cdevcsecure12392.dita
db/derby/docs/trunk/src/devguide/cdevcsecure21561.dita
db/derby/docs/trunk/src/devguide/cdevcsecure24366.dita
db/derby/docs/trunk/src/devguide/cdevcsecure24458.dita
db/derby/docs/trunk/src/devguide/cdevcsecure31493.dita
db/derby/docs/trunk/src/devguide/cdevcsecure36127.dita
db/derby/docs/trunk/src/devguide/cdevcsecure36595.dita
db/derby/docs/trunk/src/devguide/cdevcsecure37241.dita
db/derby/docs/trunk/src/devguide/cdevcsecure37817.dita
db/derby/docs/trunk/src/devguide/cdevcsecure38522.dita
db/derby/docs/trunk/src/devguide/cdevcsecure41285.dita
db/derby/docs/trunk/src/devguide/cdevcsecure42374.dita
db/derby/docs/trunk/src/devguide/cdevcsecure51876.dita
db/derby/docs/trunk/src/devguide/cdevcsecure60146.dita
db/derby/docs/trunk/src/devguide/cdevcsecure67151.dita
db/derby/docs/trunk/src/devguide/cdevcsecure79358.dita
db/derby/docs/trunk/src/devguide/cdevcsecure863446.dita
db/derby/docs/trunk/src/devguide/cdevcsecure863546.dita
db/derby/docs/trunk/src/devguide/cdevcsecure863676.dita
db/derby/docs/trunk/src/devguide/cdevcsecure864242.dita
db/derby/docs/trunk/src/devguide/cdevcsecure865580.dita
db/derby/docs/trunk/src/devguide/cdevcsecure865818.dita
db/derby/docs/trunk/src/devguide/cdevcsecure865880.dita
db/derby/docs/trunk/src/devguide/cdevcsecure866060.dita
db/derby/docs/trunk/src/devguide/cdevcsecure866716.dita
db/derby/docs/trunk/src/devguide/cdevcsecure871387.dita
db/derby/docs/trunk/src/devguide/cdevcsecure876908.dita
db/derby/docs/trunk/src/devguide/cdevcsecure88690.dita
db/derby/docs/trunk/src/devguide/cdevcsecure90988.dita
db/derby/docs/trunk/src/devguide/cdevcsecure96815.dita
db/derby/docs/trunk/src/devguide/cdevcsecure97760.dita
db/derby/docs/trunk/src/devguide/cdevcsecureDbOwner.dita
db/derby/docs/trunk/src/devguide/cdevcsecuredecryptdb.dita
db/derby/docs/trunk/src/devguide/cdevcsecuree.dita
db/derby/docs/trunk/src/devguide/cdevcsecuregrantrevokeaccess.dita
db/derby/docs/trunk/src/devguide/cdevcsecureidentity.dita
db/derby/docs/trunk/src/devguide/cdevcsecurenativeauth.dita
db/derby/docs/trunk/src/devguide/cdevcsecureprivileges.dita
db/derby/docs/trunk/src/devguide/cdevcsecureroles.dita
db/derby/docs/trunk/src/devguide/cdevcsecuresqlauthupgrade.dita
db/derby/docs/trunk/src/devguide/rdevcsecure125.dita
db/derby/docs/trunk/src/devguide/rdevcsecure190.dita
db/derby/docs/trunk/src/devguide/rdevcsecure305.dita
db/derby/docs/trunk/src/devguide/rdevcsecure379.dita
db/derby/docs/trunk/src/devguide/rdevcsecure557.dita
db/derby/docs/trunk/src/devguide/rdevcsecure622.dita
db/derby/docs/trunk/src/devguide/rdevcsecure766.dita
db/derby/docs/trunk/src/devguide/rdevcsecure871406.dita
db/derby/docs/trunk/src/devguide/rdevcsecure871422.dita
db/derby/docs/trunk/src/devguide/rdevcsecure871439.dita
db/derby/docs/trunk/src/devguide/rdevcsecurenativeauthex.dita
db/derby/docs/trunk/src/devguide/rdevcsecuresqlauthexceptions.dita
db/derby/docs/trunk/src/devguide/rdevexudclass.dita
db/derby/docs/trunk/src/devguide/security2_os.eps
db/derby/docs/trunk/src/devguide/security2_os.gif
db/derby/docs/trunk/src/devguide/security2_os.jpg
db/derby/docs/trunk/src/devguide/security_os.eps
db/derby/docs/trunk/src/devguide/security_os.gif
db/derby/docs/trunk/src/devguide/security_os.jpg
db/derby/docs/trunk/src/devguide/tdevcsecure81850.dita
db/derby/docs/trunk/src/devguide/tdevcsecure82556.dita
db/derby/docs/trunk/src/devguide/tdevcsecurenewbootpw.dita
db/derby/docs/trunk/src/devguide/tdevcsecurenewextkey.dita
db/derby/docs/trunk/src/devguide/tdevcsecurenewkeyoverview.dita
db/derby/docs/trunk/src/devguide/tdevcsecureunencrypteddb.dita
Modified:
db/derby/docs/trunk/src/devguide/cdevdgpref23947.dita
db/derby/docs/trunk/src/devguide/cdevdvlp51654.dita
db/derby/docs/trunk/src/devguide/cdevdvlpinmemdb.dita
db/derby/docs/trunk/src/devguide/derbydev.ditamap
db/derby/docs/trunk/src/devguide/tdevdvlp20349.dita
db/derby/docs/trunk/src/devguide/tdevdvlp40464.dita
Modified: db/derby/docs/trunk/src/devguide/cdevdgpref23947.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevdgpref23947.dita?rev=1600409&r1=1600408&r2=1600409&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdgpref23947.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdgpref23947.dita Wed Jun 4 18:18:13 2014
@@ -43,9 +43,6 @@ how to program database-side JDBC routin
<p>JDBC, cursors, locking and isolation levels, and multiple connections.</p></li>
<li><i><xref href="cdevresman19524.dita#cdevresman19524"></xref></i> <p>Information
for programmers developing back-end components in a J2EE system.</p></li>
-<li><i><xref href="cdevcsecuree.dita#cdevcsecuree"></xref></i> <p>Describes
-how to use the security features of
-<ph conref="../conrefs.dita#prod/productshortname"></ph>.</p></li>
<li><i><xref href="cdevadvjdbc35053.dita#cdevadvjdbc35053"></xref></i> <p>Tips
for tool designers.</p></li>
<li><i><xref href="cdevtricks32436.dita#cdevtricks32436"></xref></i> <p>Insiders'
Modified: db/derby/docs/trunk/src/devguide/cdevdvlp51654.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevdvlp51654.dita?rev=1600409&r1=1600408&r2=1600409&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp51654.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp51654.dita Wed Jun 4 18:18:13 2014
@@ -41,8 +41,9 @@ attributes in the <i>Properties</i> obje
<p>For more information on working with connection URL attributes, see the
following:
<ul>
-<li><xref href="cdevcsecure24366.dita#cdevcsecure24366"></xref> for information
-on database encryption</li>
+<li>"Configuring database encryption" in the
+<ph conref="../conrefs.dita#pub/citsec"></ph> for information on database
+encryption</li>
<li><ph conref="../conrefs.dita#pub/citadmin"></ph> for information on tracing
network clients, replicating databases, restoring databases from backup, and
logging on separate devices</li>
Modified: db/derby/docs/trunk/src/devguide/cdevdvlpinmemdb.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevdvlpinmemdb.dita?rev=1600409&r1=1600408&r2=1600409&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlpinmemdb.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlpinmemdb.dita Wed Jun 4 18:18:13 2014
@@ -88,15 +88,10 @@ database also performs the shutdown.</p>
be an error but is actually an indication of success. You need to catch error
08006, as described in "The WwdEmbedded program" in
<ph conref="../conrefs.dita#pub/citgetstart"></ph>.</p>
-<p>
-If user
-<xref href="cdevcsecure36127.dita#cdevcsecure36127">authentication</xref>
-and
-<xref href="cdevcsecure36595.dita#cdevcsecure36595">SQL authorization</xref>
-are both enabled, only the
-<xref href="cdevcsecureDbOwner.dita#cdevcsecureDbOwner">database owner</xref>
-can drop the database.
-</p>
+<p>If user authentication and SQL authorization are both enabled, only the
+database owner can drop the database. (See the
+<ph conref="../conrefs.dita#pub/citsec"></ph> for details on authentication and
+authorization.)</p>
<p>An in-memory database is automatically removed if any of the following
happens:</p>
<ul>
Modified: db/derby/docs/trunk/src/devguide/derbydev.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/derbydev.ditamap?rev=1600409&r1=1600408&r2=1600409&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/derbydev.ditamap (original)
+++ db/derby/docs/trunk/src/devguide/derbydev.ditamap Wed Jun 4 18:18:13 2014
@@ -378,16 +378,6 @@ limitations under the License.
</relrow>
<relrow>
<relcell>
-<topicref href="tdevdvlp12233.dita" navtitle="Providing a user name and password">
-</topicref>
-</relcell>
-<relcell>
-<topicref href="cdevcsecure42374.dita" navtitle="Working with user authentication">
-</topicref>
-</relcell>
-</relrow>
-<relrow>
-<relcell>
<topicref href="cdevstart16043.dita" navtitle="The installation directory">
</topicref>
</relcell>
@@ -532,7 +522,6 @@ limitations under the License.
<relcell>
<topicref href="cdevdeploy17604.dita" navtitle="Dynamic changes to jar files or to the database jar classpath">
</topicref>
-<topicref href="cdevcsecure90988.dita" navtitle="Signed jar files"></topicref>
</relcell>
</relrow>
<relrow>
@@ -1171,276 +1160,6 @@ limitations under the License.
</relrow>
<relrow>
<relcell>
-<topicref href="cdevcsecurenativeauth.dita" navtitle="Using NATIVE authentication">
-</topicref>
-</relcell>
-<relcell>
-<topicref href="cdevcsecure36127.dita" navtitle="Enabling user authentication"></topicref>
-<topicref href="cdevcsecure37817.dita" navtitle="Defining users"></topicref>
-<topicref href="cdevcsecure38522.dita" navtitle="External directory service">
-</topicref>
-<topicref href="rdevcsecure557.dita" navtitle="List of user-authentication properties">
-</topicref>
-<topicref href="cdevcsecure79358.dita" navtitle="Programming applications for Derby user authentication">
-</topicref>
-</relcell>
-</relrow>
-<relrow>
-<relcell>
-<topicref href="cdevcsecure36127.dita" navtitle="Enabling user authentication">
-</topicref>
-</relcell>
-<relcell>
-<topicref href="cdevcsecurenativeauth.dita" navtitle="Using NATIVE authentication"></topicref>
-<topicref href="cdevcsecure37817.dita" navtitle="Defining users"></topicref>
-<topicref href="cdevcsecure38522.dita" navtitle="External directory service">
-</topicref>
-<topicref href="rdevcsecure557.dita" navtitle="List of user-authentication properties">
-</topicref>
-<topicref href="cdevcsecure79358.dita" navtitle="Programming applications for Derby user authentication">
-</topicref>
-</relcell>
-</relrow>
-<relrow>
-<relcell>
-<topicref href="cdevcsecure37817.dita" navtitle="Defining users"></topicref>
-</relcell>
-<relcell>
-<topicref href="cdevcsecurenativeauth.dita" navtitle="Using NATIVE authentication"></topicref>
-<topicref href="cdevcsecure38522.dita" navtitle="External directory service">
-</topicref>
-<topicref href="rdevcsecure557.dita" navtitle="List of user-authentication properties">
-</topicref>
-<topicref href="cdevcsecure79358.dita" navtitle="Programming applications for Derby user authentication">
-</topicref>
-<topicref href="cdevcsecure21561.dita" navtitle="User-defined class"></topicref>
-</relcell>
-</relrow>
-<relrow>
-<relcell>
-<topicref href="cdevcsecure38522.dita" navtitle="External directory service">
-</topicref>
-</relcell>
-<relcell>
-<topicref href="rdevcsecure557.dita" navtitle="List of user-authentication properties">
-</topicref>
-<topicref href="cdevcsecure79358.dita" navtitle="Programming applications for Derby user authentication">
-</topicref>
-</relcell>
-</relrow>
-<relrow>
-<relcell>
-<topicref href="rdevcsecure557.dita" navtitle="List of user-authentication properties">
-</topicref>
-</relcell>
-<relcell>
-<topicref href="cdevcsecurenativeauth.dita" navtitle="Using NATIVE authentication"></topicref>
-<topicref href="cdevcsecure79358.dita" navtitle="Programming applications for Derby user authentication">
-</topicref>
-</relcell>
-</relrow>
-<relrow>
-<relcell>
-<topicref href="cdevcsecure864242.dita" navtitle="JNDI-specific properties for external directory services">
-</topicref>
-</relcell>
-<relcell>
-<topicref href="cdevcsecure21561.dita" navtitle="User-defined class"></topicref>
-</relcell>
-</relrow>
-<relrow>
-<relcell>
-<topicref href="rdevcsecure766.dita" navtitle="Programming the application to provide the user and password">
-</topicref>
-</relcell>
-<relcell>
-<topicref href="rdevcsecure305.dita" navtitle="Login failure exceptions with user authentication">
-</topicref>
-</relcell>
-</relrow>
-<relrow>
-<relcell>
-<topicref href="cdevcsecure24458.dita" navtitle="Authorization identifiers, user authentication, and user authorization">
-</topicref>
-</relcell>
-<relcell>
-<topicref href="cdevcsecureDbOwner.dita" navtitle="Database owner"></topicref>
-<topicref href="cdevcsecure865580.dita" navtitle="User names and schemas">
-</topicref>
-<topicref href="rdevcsecure622.dita" navtitle="Exceptions when using authorization identifiers">
-</topicref>
-<topicref href="cdevcsecure36595.dita" navtitle="User authorization"></topicref>
-</relcell>
-</relrow>
-<relrow>
-<relcell>
-<topicref href="cdevcsecureDbOwner.dita" navtitle="Database owner"></topicref>
-</relcell>
-<relcell>
-<topicref href="cdevcsecure865580.dita" navtitle="User names and schemas">
-</topicref>
-</relcell>
-<relcell>
-<topicref href="rdevcsecure622.dita" navtitle="Exceptions when using authorization identifiers">
-</topicref>
-</relcell>
-</relrow>
-<relrow>
-<relcell>
-<topicref href="cdevcsecure88690.dita" navtitle="Encrypting databases on creation">
-</topicref>
-</relcell>
-<relcell>
-<topicref href="cdevcsecure866716.dita" navtitle="Creating a boot password">
-</topicref>
-<topicref href="cdevcsecure31493.dita" navtitle="Specifying an alternate encryption provider">
-</topicref>
-<topicref href="cdevcsecure67151.dita" navtitle="Specifying an alternate encryption algorithm">
-</topicref>
-<topicref href="cdevcsecure60146.dita" navtitle="Booting an encrypted database">
-</topicref>
-<topicref href="cdevcsecuredecryptdb.dita" navtitle="Decrypting an encrypted database">
-</topicref>
-</relcell>
-</relrow>
-<relrow>
-<relcell>
-<topicref href="tdevcsecureunencrypteddb.dita" navtitle="Encrypting an existing unencrypted database">
-</topicref>
-</relcell>
-<relcell>
-<topicref href="cdevcsecure60146.dita" navtitle="Booting an encrypted database">
-</topicref>
-<topicref href="cdevcsecure96815.dita" navtitle="Requirements for Derby encryption">
-</topicref>
-<topicref href="cdevcsecuredecryptdb.dita" navtitle="Decrypting an encrypted database">
-</topicref>
-</relcell>
-</relrow>
-<relrow>
-<relcell>
-<topicref href="cdevcsecure866716.dita" navtitle="Creating a boot password">
-</topicref>
-</relcell>
-<relcell>
-<topicref href="cdevcsecure60146.dita" navtitle="Booting an encrypted database">
-</topicref>
-</relcell>
-</relrow>
-<relrow>
-<relcell>
-<topicref href="cdevcsecure60146.dita" navtitle="Booting an encrypted database">
-</topicref>
-</relcell>
-<relcell>
-</relcell>
-</relrow>
-<relrow>
-<relcell>
-<topicref href="cdevcsecure31493.dita" navtitle="Specifying an alternate encryption provider">
-</topicref>
-</relcell>
-<relcell>
-<topicref href="cdevcsecure67151.dita" navtitle="Specifying an alternate encryption algorithm">
-</topicref>
-</relcell>
-</relrow>
-<relrow>
-<relcell>
-<topicref href="tdevcsecurenewkeyoverview.dita" navtitle="Encrypting databases with a new key">
-</topicref>
-</relcell>
-<relcell>
-<topicref href="tdevcsecureunencrypteddb.dita" navtitle="Encrypting an existing unencrypted database">
-</topicref>
-<topicref href="cdevcsecure88690.dita" navtitle="Encrypting databases on creation">
-</topicref>
-<topicref href="cdevcsecure96815.dita" navtitle="Requirements for Derby encryption">
-</topicref>
-</relcell>
-</relrow>
-<relrow>
-<relcell>
-<topicref href="tdevcsecurenewbootpw.dita" navtitle="Encrypting databases with a new boot password">
-</topicref>
-</relcell>
-<relcell>
-<topicref href="cdevcsecure60146.dita" navtitle="Booting an encrypted database">
-</topicref>
-<topicref href="tdevcsecurenewextkey.dita" navtitle="Encrypting databases with a new external key">
-</topicref>
-<topicref href="cdevcsecure96815.dita" navtitle="Requirements for Derby encryption">
-</topicref>
-</relcell>
-</relrow>
-<relrow>
-<relcell>
-<topicref href="tdevcsecurenewextkey.dita" navtitle="Encrypting databases with a new external key">
-</topicref>
-</relcell>
-<relcell>
-<topicref href="tdevcsecurenewbootpw.dita" navtitle="Encrypting databases with a new boot password">
-</topicref>
-<topicref href="cdevcsecure60146.dita" navtitle="Booting an encrypted database">
-</topicref>
-<topicref href="cdevcsecure96815.dita" navtitle="Requirements for Derby encryption">
-</topicref>
-</relcell>
-</relrow>
-<relrow>
-<relcell>
-<topicref href="cdevcsecure96815.dita" navtitle="Requirements for Derby encryption">
-</topicref>
-</relcell>
-<relcell>
-<topicref href="cdevcsecure97760.dita" navtitle="Working with encryption">
-</topicref>
-<topicref href="cdevcsecure88690.dita" navtitle="Encrypting databases on creation">
-</topicref>
-</relcell>
-</relrow>
-<relrow>
-<relcell>
-<topicref href="cdevcsecuredecryptdb.dita" navtitle="Decrypting an encrypted database">
-</topicref>
-</relcell>
-<relcell>
-</relcell>
-</relrow>
-<relrow>
-<relcell>
-<topicref href="cdevbabejgjd.dita" navtitle="Granting permissions to Derby">
-</topicref>
-</relcell>
-<relcell>
-<topicref href="cdevcsecure871387.dita" navtitle="Examples of Java 2 security policy files for embedded Derby">
-</topicref>
-</relcell>
-</relrow>
-<relrow>
-<relcell>
-<topicref href="rdevcsecure871406.dita" navtitle="Java 2 security policy file example 1">
-</topicref>
-</relcell>
-<relcell>
-<topicref href="rdevcsecure871422.dita" navtitle="Java 2 security policy file example 2">
-</topicref>
-<topicref href="rdevcsecure871439.dita" navtitle="Java 2 security policy file example 3">
-</topicref>
-</relcell>
-</relrow>
-<relrow>
-<relcell>
-<topicref href="rdevcsecure871422.dita" navtitle="Java 2 security policy file example 2">
-</topicref>
-</relcell>
-<relcell>
-<topicref href="rdevcsecure871439.dita" navtitle="Java 2 security policy file example 3">
-</topicref>
-</relcell>
-</relrow>
-<relrow>
-<relcell>
<topicref href="cdevadvjdbc41138.dita" navtitle="Offering connection choices to the user">
</topicref>
</relcell>
@@ -1913,118 +1632,6 @@ with updatable result sets"></topicref>
<topicref href="cdevresman92946.dita" navtitle="Shutting down or creating a database">
</topicref>
</topicref>
-<topicref collection-type="family" href="cdevcsecuree.dita" navtitle="Configuring security for Derby">
-<topicref href="cdevcsecureidentity.dita" navtitle="Identity in Derby">
-</topicref>
-<topicref href="cdevcsecure12392.dita" navtitle="Basic security configuration tasks">
-<topicref href="tdevcsecure82556.dita" navtitle="Configuring security in a client/server environment">
-</topicref>
-<topicref href="tdevcsecure81850.dita" navtitle="Configuring security in an embedded environment">
-</topicref>
-</topicref>
-<topicref href="cdevcsecure42374.dita" navtitle="Working with user authentication">
-<topicref href="cdevcsecurenativeauth.dita" navtitle="Using NATIVE authentication">
-</topicref>
-<topicref href="cdevcsecure36127.dita" navtitle="Enabling user authentication">
-</topicref>
-<topicref href="cdevcsecure37817.dita" navtitle="Defining users"></topicref>
-<topicref href="cdevcsecure38522.dita" navtitle="External directory service">
-<topicref collection-type="family" href="cdevcsecure41285.dita" navtitle="LDAP directory service">
-<topicref href="cdevcsecure863446.dita" navtitle="Setting up Derby to use your LDAP directory service">
-</topicref>
-<topicref href="cdevcsecure876908.dita" navtitle="Guest access to search for DNs">
-</topicref>
-<topicref href="cdevcsecure863546.dita" navtitle="LDAP performance issues">
-</topicref>
-<topicref href="cdevcsecure863676.dita" navtitle="LDAP restrictions"></topicref>
-</topicref>
-<topicref href="cdevcsecure864242.dita" navtitle="JNDI-specific properties for external directory services">
-</topicref>
-<topicref href="cdevcsecure21561.dita" navtitle="User-defined class">
-<topicref href="rdevexudclass.dita" navtitle="Example of setting a user-defined class">
-</topicref>
-</topicref>
-</topicref>
-<topicref href="rdevcsecure557.dita" navtitle="List of user-authentication properties">
-</topicref>
-<topicref href="cdevcsecure79358.dita" navtitle="Programming applications for Derby user authentication">
-<topicref href="rdevcsecure766.dita" navtitle="Programming the application to provide the user and password">
-</topicref>
-<topicref href="rdevcsecure305.dita" navtitle="Login failure exceptions with user authentication">
-</topicref>
-</topicref>
-</topicref>
-<topicref href="cdevcsecure37241.dita" navtitle="Users and authorization identifiers">
-<topicref href="cdevcsecure24458.dita" navtitle="Authorization identifiers, user authentication, and user authorization">
-</topicref>
-<topicref href="cdevcsecureDbOwner.dita" navtitle="Database owner"></topicref>
-<topicref href="cdevcsecure865580.dita" navtitle="User names and schemas">
-</topicref>
-<topicref href="rdevcsecure622.dita" navtitle="Exceptions when using authorization identifiers">
-</topicref>
-</topicref>
-<topicref collection-type="family" href="cdevcsecure36595.dita" navtitle="User authorizations">
-<topicref collection-type="family" href="cdevcsecure866060.dita" navtitle="Setting the SQL standard authorization mode">
-<topicref href="cdevcsecuregrantrevokeaccess.dita" navtitle="Using SQL standard authorization"></topicref>
-<topicref href="cdevcsecureprivileges.dita" navtitle="Privileges on views, triggers, constraints, and generated columns"></topicref>
-<topicref href="cdevcsecureroles.dita" navtitle="Using SQL roles"></topicref>
-<topicref href="cdevcsecuresqlauthupgrade.dita" navtitle="Upgrading an old database to use SQL standard authorization"></topicref>
-<topicref href="rdevcsecuresqlauthexceptions.dita" navtitle="SQL standard authorization exceptions"></topicref>
-</topicref>
-<topicref href="cdevcsecure865818.dita" navtitle="Setting the default connection access mode"></topicref>
-<topicref collection-type="family" href="cdevcsecure865880.dita" navtitle="Setting access for individual users">
-<topicref href="rdevcsecure190.dita" navtitle="Read-only and full access permissions"></topicref>
-<topicref href="rdevcsecure379.dita" navtitle="User authorization exceptions"></topicref>
-</topicref>
-</topicref>
-<topicref href="cdevcsecure24366.dita" navtitle="Encrypting databases on disk">
-<topicref href="cdevcsecure96815.dita" navtitle="Requirements for Derby encryption">
-</topicref>
-<topicref href="cdevcsecure97760.dita" navtitle="Working with encryption">
-<topicref href="cdevcsecure88690.dita" navtitle="Encrypting databases on creation">
-</topicref>
-<topicref href="tdevcsecureunencrypteddb.dita" navtitle="Encrypting an existing unencrypted database">
-</topicref>
-<topicref href="cdevcsecure866716.dita" navtitle="Creating the boot password">
-<topicref href="cdevcsecure31493.dita" navtitle="Specifying an alternate encryption provider">
-</topicref>
-<topicref href="cdevcsecure67151.dita" navtitle="Specifying an alternate encryption algorithm">
-</topicref>
-</topicref>
-<topicref href="tdevcsecurenewkeyoverview.dita" navtitle="Encrypting databases with a new key">
-<topicref href="tdevcsecurenewbootpw.dita" navtitle="Encrypting databases with a new boot password">
-</topicref>
-<topicref href="tdevcsecurenewextkey.dita" navtitle="Encrypting databases with a new external key">
-</topicref>
-</topicref>
-<topicref href="cdevcsecure60146.dita" navtitle="Booting an encrypted database">
-</topicref>
-<topicref href="cdevcsecuredecryptdb.dita" navtitle="Decrypting an encrypted database">
-</topicref>
-</topicref>
-</topicref>
-<topicref href="cdevcsecure90988.dita" navtitle="Signed jar files"></topicref>
-<topicref href="cdevcsecure10983.dita" navtitle="Notes on the Derby security features">
-</topicref>
-<topicref href="cdevcsecure51876.dita" navtitle="User authentication and authorization examples">
-<topicref href="rdevcsecurenativeauthex.dita" navtitle="NATIVE authentication and SQL authorization example">
-</topicref>
-<topicref href="rdevcsecure125.dita" navtitle="Setting LDAP user authentication properties in a client/server environment">
-</topicref>
-</topicref>
-<topicref href="cdevcbabejdfj.dita" navtitle="Running Derby under a security manager">
-<topicref href="cdevbabejgjd.dita" navtitle="Granting permissions to Derby">
-</topicref>
-<topicref href="cdevcsecure871387.dita" navtitle="Examples of Java 2 security policy files for embedded Derby">
-<topicref href="rdevcsecure871406.dita" navtitle="Java 2 security policy file example 1">
-</topicref>
-<topicref href="rdevcsecure871422.dita" navtitle="Java 2 security policy file example 2">
-</topicref>
-<topicref href="rdevcsecure871439.dita" navtitle="Java 2 security policy file example 3">
-</topicref>
-</topicref>
-</topicref>
-</topicref>
<topicref href="cdevadvjdbc35053.dita" navtitle="Developing Tools and Using Derby with an IDE">
<topicref href="cdevadvjdbc41138.dita" navtitle="Offering connection choices to the user">
<topicref href="rdevadvjdbc034.dita" navtitle="The DriverPropertyInfo Array">
Modified: db/derby/docs/trunk/src/devguide/tdevdvlp20349.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/tdevdvlp20349.dita?rev=1600409&r1=1600408&r2=1600409&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/tdevdvlp20349.dita (original)
+++ db/derby/docs/trunk/src/devguide/tdevdvlp20349.dita Wed Jun 4 18:18:13 2014
@@ -44,7 +44,8 @@ sun.misc.Launcher$AppClassLoader@9931f5
<p>If you are running with a security manager on JDK 8 or higher, you must grant
<ph conref="../conrefs.dita#prod/productshortname"></ph> permission to
deregister the embedded driver in order to fully shut down the system. See
-<xref href="cdevbabejgjd.dita#cdevbabejgjd"></xref> for details.</p>
+"Configuring Java security" in the <ph conref="../conrefs.dita#pub/citsec"></ph>
+for details.</p>
<p>Typically,
an application using an embedded <ph conref="../conrefs.dita#prod/productshortname"></ph> engine
shuts down <ph conref="../conrefs.dita#prod/productshortname"></ph> just before
Modified: db/derby/docs/trunk/src/devguide/tdevdvlp40464.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/tdevdvlp40464.dita?rev=1600409&r1=1600408&r2=1600409&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/tdevdvlp40464.dita (original)
+++ db/derby/docs/trunk/src/devguide/tdevdvlp40464.dita Wed Jun 4 18:18:13 2014
@@ -37,7 +37,8 @@ shut down and that there is no other exc
<p>If you are running with a security manager on JDK 8 or higher, you must grant
<ph conref="../conrefs.dita#prod/productshortname"></ph> permission to
deregister the embedded driver in order to fully shut down the system. See
-<xref href="cdevbabejgjd.dita#cdevbabejgjd"></xref> for details.</p>
+"Configuring Java security" in the <ph conref="../conrefs.dita#pub/citsec"></ph>
+for details.</p>
<p>If you have enabled user authentication at the system level, you will need to
specify credentials (that is, username and password) in order to shut down a
<ph conref="../conrefs.dita#prod/productshortname"></ph> system, and the
@@ -48,16 +49,10 @@ down the database of the current connect
instead of a database name<i> </i>(within an SQL statement).</p><codeblock><b>// shutting down a database from your application</b>
DriverManager.getConnection(
"jdbc:derby:sample;shutdown=true");</codeblock>
-<p>
-If user
-<xref href="cdevcsecure36127.dita#cdevcsecure36127">authentication</xref>
-and
-<xref href="cdevcsecure36595.dita#cdevcsecure36595">SQL authorization</xref>
-are both enabled, only the
-<xref href="cdevcsecureDbOwner.dita#cdevcsecureDbOwner">database owner</xref>
-can shut down the database.
-</p>
-
+<p>If user authentication and SQL authorization are both enabled, only the
+database owner can shut down the database. (See the
+<ph conref="../conrefs.dita#pub/citsec"></ph> for details on authentication and
+authorization.)</p>
<codeblock><b>// shutting down an authenticated database as database owner</b>
DriverManager.getConnection(
"jdbc:derby:securesample;user=joeowner;password=secret;shutdown=true");</codeblock>