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 jt...@apache.org on 2005/05/11 20:13:05 UTC

svn commit: r169667 - in /incubator/derby/docs/trunk/src: devguide/cdevcsecure865880.dita ref/rrefsistabs79888.dita tools/derbytools.ditamap tools/rtoolsijcomref76590.dita tools/rtoolsijpropref29864.dita tools/rtoolsijpropref62800.dita tools/rtoolsijpropref97949.dita

Author: jta
Date: Wed May 11 11:13:03 2005
New Revision: 169667

URL: http://svn.apache.org/viewcvs?rev=169667&view=rev
Log:
Applied Jeff's patches for DERBY-87, DERBY-116 and DERBY-164

Modified:
    incubator/derby/docs/trunk/src/devguide/cdevcsecure865880.dita
    incubator/derby/docs/trunk/src/ref/rrefsistabs79888.dita
    incubator/derby/docs/trunk/src/tools/derbytools.ditamap
    incubator/derby/docs/trunk/src/tools/rtoolsijcomref76590.dita
    incubator/derby/docs/trunk/src/tools/rtoolsijpropref29864.dita
    incubator/derby/docs/trunk/src/tools/rtoolsijpropref62800.dita
    incubator/derby/docs/trunk/src/tools/rtoolsijpropref97949.dita

Modified: incubator/derby/docs/trunk/src/devguide/cdevcsecure865880.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevcsecure865880.dita?rev=169667&r1=169666&r2=169667&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevcsecure865880.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevcsecure865880.dita Wed May 11 11:13:03 2005
@@ -21,7 +21,6 @@
 <title>Setting the access mode for particular users</title>
 <prolog><metadata>
 <keywords><indexterm>Access<indexterm>full (read-write) versus read-only</indexterm></indexterm>
-<indexterm>UserUtility</indexterm><indexterm>org.apache.derby.database.UserUtility</indexterm>
 </keywords>
 </metadata></prolog>
 <conbody>

Modified: incubator/derby/docs/trunk/src/ref/rrefsistabs79888.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsistabs79888.dita?rev=169667&r1=169666&r2=169667&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsistabs79888.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsistabs79888.dita Wed May 11 11:13:03 2005
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,14 +16,10 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-
-<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
- "../dtd/reference.dtd">
 <reference id="rrefsistabs79888" xml:lang="en-us">
 <title>SYSTRIGGERS</title>
 <refbody>
-<section><p>Describes the database's triggers.   <table expanse="page"
-frame="all">
+<section><p>Describes the database's triggers.   <table expanse="page" frame="all">
 <tgroup cols="5" colsep="1" rowsep="1"><colspec colname="1" colnum="1" colwidth="29*"/>
 <colspec colname="2" colnum="2" colwidth="23*"/><colspec colname="3" colnum="3"
 colwidth="11*"/><colspec colname="4" colnum="4" colwidth="14*"/><colspec colname="5"
@@ -127,7 +125,7 @@
 <entry colname="2">LONG VARCHAR</entry>
 <entry colname="3"></entry>
 <entry colname="4">true</entry>
-<entry colname="5">body of CREATE TRIGGER statement</entry>
+<entry colname="5">text of the action SQL statement</entry>
 </row>
 <row>
 <entry colname="1">REFERENCINGOLD</entry>
@@ -162,4 +160,4 @@
 a trigger are always in the same schema as the trigger.</p></section>
 </refbody>
 </reference>
-<?Pub *0000005098?>
+<?Pub *0000005740?>

Modified: incubator/derby/docs/trunk/src/tools/derbytools.ditamap
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tools/derbytools.ditamap?rev=169667&r1=169666&r2=169667&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tools/derbytools.ditamap (original)
+++ incubator/derby/docs/trunk/src/tools/derbytools.ditamap Wed May 11 11:13:03 2005
@@ -89,8 +89,6 @@
 <topicref href="rtoolsijpropref12236.dita" navtitle="ij.protocol.protocolName">
 </topicref>
 <topicref href="rtoolsijpropref25589.dita" navtitle="ij.showErrorCode"></topicref>
-<topicref href="rtoolsijpropref62800.dita" navtitle="ij.unicodeEscape" otherprops="NOTcommercial ">
-</topicref>
 <topicref href="rtoolsijpropref38481.dita" navtitle="ij.URLCheck"></topicref>
 <topicref href="rtoolsijpropref97949.dita" navtitle="derby.ui.codeset"></topicref>
 </topicref>
@@ -137,8 +135,6 @@
 <topicref href="rtoolsijcomref28886.dita" navtitle="Run"></topicref>
 <topicref href="rtoolsijcomref39198.dita" navtitle="Set Connection"></topicref>
 <topicref href="rtoolsijcomref17529.dita" navtitle="Show Connections"></topicref>
-<topicref href="rtoolsijcomref76590.dita" navtitle="UnicodeEscape" otherprops="NOTcommercial ">
-</topicref>
 <topicref href="rtoolsijcomref17631.dita" navtitle="Wait For"></topicref>
 <topicref href="rtoolsijcomref16653.dita" navtitle="Comment"></topicref>
 <topicref href="rtoolsijcomref40155.dita" navtitle="Identifier"></topicref>

Modified: incubator/derby/docs/trunk/src/tools/rtoolsijcomref76590.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tools/rtoolsijcomref76590.dita?rev=169667&r1=169666&r2=169667&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tools/rtoolsijcomref76590.dita (original)
+++ incubator/derby/docs/trunk/src/tools/rtoolsijcomref76590.dita Wed May 11 11:13:03 2005
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
-
-Licensed under the Apache License, Version 2.0 (the "License");  
-you may not use this file except in compliance with the License.  
-You may obtain a copy of the License at      
-
-http://www.apache.org/licenses/LICENSE-2.0  
-
-Unless required by applicable law or agreed to in writing, software  
-distributed under the License is distributed on an "AS IS" BASIS,  
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
-See the License for the specific language governing permissions and  
-limitations under the License.
--->
-<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rtoolsijcomref76590" otherprops="NOTcommercial ">
-<title>UnicodeEscape</title>
-<prolog><metadata>
-<keywords><indexterm>UnicodeEscape</indexterm><indexterm>Unicode<indexterm>escape sequences</indexterm></indexterm><indexterm>Escape sequences<indexterm>and unicode</indexterm></indexterm>
-</keywords>
-</metadata>
-</prolog><refbody>
-<refsyn><title>Syntax</title>
-<codeblock><b>unicodeEscape { on | off }</b></codeblock>
-</refsyn>
-<section><title>Description</title>
-<p>Use this command during an <codeph>ij</codeph> session to allow unicode escape
-sequences as input characters during the <codeph>ij</codeph> session. By default,
-unicodeEscape is set to 'off' (<codeph>ij</codeph> does not accept unicode
-escape characters).  
-<note>You can also set the <i><xref href="rtoolsijpropref62800.dita#rtoolsijpropref62800"/></i> property for an ij session when
-you start <codeph>ij</codeph>. For more information, see <i><xref href="rtoolsijpropref62800.dita#rtoolsijpropref62800"/>.</i></note></p>
-<p>If set to <i>on</i>, enter unicode symbols using unicode
-escape sequences (hexadecimal codes).</p>
-</section>
-<example><title>Example</title>
-<codeblock><b>ij&gt; unicodeescape on;
-ij&gt; VALUES '\u00f1';</b>
-1
--
-ñ
-<b>ij&gt; unicodeescape off;
-ij&gt; VALUES '\u00f1';</b>
-1
-------
-\u00f1</codeblock>
-</example></refbody></reference>

Modified: incubator/derby/docs/trunk/src/tools/rtoolsijpropref29864.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tools/rtoolsijpropref29864.dita?rev=169667&r1=169666&r2=169667&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tools/rtoolsijpropref29864.dita (original)
+++ incubator/derby/docs/trunk/src/tools/rtoolsijpropref29864.dita Wed May 11 11:13:03 2005
@@ -35,7 +35,6 @@
 <li><i><xref href="rtoolsijpropref35032.dita#rtoolsijpropref35032"/></i></li>
 <li><i><xref href="rtoolsijpropref12236.dita#rtoolsijpropref12236"/></i></li>
 <li><i><xref href="rtoolsijpropref25589.dita#rtoolsijpropref25589"/></i></li>
-<li otherprops="NOTcommercial "><i><xref href="rtoolsijpropref62800.dita#rtoolsijpropref62800"/></i></li>
 <li><i><xref href="rtoolsijpropref38481.dita#rtoolsijpropref38481"/></i></li>
 </ul></p></section>
 </refbody></reference>

Modified: incubator/derby/docs/trunk/src/tools/rtoolsijpropref62800.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tools/rtoolsijpropref62800.dita?rev=169667&r1=169666&r2=169667&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tools/rtoolsijpropref62800.dita (original)
+++ incubator/derby/docs/trunk/src/tools/rtoolsijpropref62800.dita Wed May 11 11:13:03 2005
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
-
-Licensed under the Apache License, Version 2.0 (the "License");  
-you may not use this file except in compliance with the License.  
-You may obtain a copy of the License at      
-
-http://www.apache.org/licenses/LICENSE-2.0  
-
-Unless required by applicable law or agreed to in writing, software  
-distributed under the License is distributed on an "AS IS" BASIS,  
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
-See the License for the specific language governing permissions and  
-limitations under the License.
--->
-<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rtoolsijpropref62800" otherprops="NOTcommercial ">
-<title>ij.unicodeEscape</title>
-<prolog><metadata>
-<keywords><indexterm>ij.unicodeEscape</indexterm>
-</keywords>
-</metadata>
-</prolog><refbody>
-<section><title>Function</title>
-<p>Set this property to <i>on</i> to allow unicode escape
-sequences as input characters. By default, <codeph>ij</codeph> accepts unicode characters,
-not unicode escape characters.</p>
-<p>If set to <i>on</i>, enter unicode symbols using unicode
-escape sequences (hexadecimal codes).</p>
-</section>
-<refsyn><title>Syntax</title>
-<codeblock><b>ij.unicodeEscape= { on | off }</b></codeblock>
-</refsyn>
-<example><title>Example</title>
-<p>The following command line specifies to run <codeph>ij</codeph> using the Japanese
-locale (<codeph><b>territory=ja</b></codeph>), in Japanese Latin
-Kanji mixed encoding (<codeph><b>codeset=Cp939</b></codeph>), allowing
-Unicode escape sequences (<codeph><b>unicodeEscape=on</b></codeph>):
-  
-<codeblock><b>java -Dderby.ui.territory=ja -Dderby.ui.codeset=Cp939 
-  -Dij.unicodeEscape=on -Dij.protocol=jdbc:derby:
-    org.apache.derby.tools.ij</b></codeblock></p>
-<p>With <codeph>ij.unicodeEscape</codeph> turned off:  
-<codeblock>-- When ij.unicodeEscape is set to off (or not set), ij will interpret
--- the string that follows as a literal string of five characters
-
-
-<b>values '\u00f1';</b>
-1
-------
-\u00f1</codeblock></p>
-<p>With <codeph>ij.unicodeEscape</codeph> turned on:  
-<codeblock>-- When unicodeEscape is set to on, ij interprets the string that
--- follows as a unicode escape character.
-
-1 row selected
-<b>values '\u00f1';</b>
-&amp;
--
-ñ</codeblock></p>
-</example></refbody></reference>

Modified: incubator/derby/docs/trunk/src/tools/rtoolsijpropref97949.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tools/rtoolsijpropref97949.dita?rev=169667&r1=169666&r2=169667&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tools/rtoolsijpropref97949.dita (original)
+++ incubator/derby/docs/trunk/src/tools/rtoolsijpropref97949.dita Wed May 11 11:13:03 2005
@@ -33,11 +33,10 @@
 </refsyn>
 <example><title>Example</title>
 <p>The following command line specifies to run <codeph>ij</codeph> using the Japanese
-territory (<i>territory=ja_JP</i>), using Japanese Latin
-Kanji mixed encoding (<i>codeset=Cp939</i>), allowing Unicode
-escape sequences (<i>unicodeEscape=on</i>): </p>
+territory (<i>territory=ja_JP</i>) using Japanese Latin
+Kanji mixed encoding (<i>codeset=Cp939</i>): </p>
 <codeblock><b>java -Dderby.ui.territory=ja_JP -Dderby.ui.codeset=Cp939 
-    -Dij.unicodeEscape=on -Dij.protocol=jdbc:derby:
+    -Dij.protocol=jdbc:derby:
     org.apache.derby.tools.ij</b></codeblock>
 <p>The following table contains a sampling of character encodings supported
 by the IBM Application Developer Kit. To see the full list, go to <i><xref scope="local" format="html" href="http://java.sun.com/j2se/1.3/docs/guide/intl/encoding.doc.html">http://java.sun.com/j2se/1.3/docs/guide/intl/encoding.doc.html</xref></i>.