db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r1037009 - in /db/derby/code/trunk/java: build/org/apache/derbyBuild/javadoc/ engine/org/apache/derby/impl/store/access/btree/ engine/org/apache/derby/impl/store/access/btree/index/ engine/org/apache/derby/impl/store/access/heap/ engine/org...
Date Fri, 19 Nov 2010 20:23:02 GMT
Author: dag
Date: Fri Nov 19 20:23:01 2010
New Revision: 1037009

URL: http://svn.apache.org/viewvc?rev=1037009&view=rev
Log:
DERBY-4897 Get rid of warning for customized tags in javadoc build

Changed all Derby custom javadoc tags to this syntax, which contains a period
(".") and thus silences the warnings:

<derby_custom_tag> ::= derby "." <camelCasedVersionOfOldTag>

e.g.

DiskLayoutTaglet.java:29: private String NAME = "derby.diskLayout";
EndFormatTaglet.java:28: private String NAME = "derby.endFormat";
FormatIdTaglet.java:29: private String NAME = "derby.formatId";
PurposeTaglet.java:29: private String NAME = "derby.purpose";
UpgradeTaglet.java:29: private String NAME = "derby.upgrade"; 


Modified:
    db/derby/code/trunk/java/build/org/apache/derbyBuild/javadoc/DiskLayoutTaglet.java
    db/derby/code/trunk/java/build/org/apache/derbyBuild/javadoc/EndFormatTaglet.java
    db/derby/code/trunk/java/build/org/apache/derbyBuild/javadoc/FormatIdTaglet.java
    db/derby/code/trunk/java/build/org/apache/derbyBuild/javadoc/PurposeTaglet.java
    db/derby/code/trunk/java/build/org/apache/derbyBuild/javadoc/UpgradeTaglet.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BranchControlRow.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/LeafControlRow.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2I.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IUndo.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2I_10_3.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2I_v10_2.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/Heap.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapRowLocation.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/Heap_v10_2.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/AllocExtent.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/AllocPage.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/CopyRowsOperation.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/DeleteOperation.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/EncryptContainerOperation.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/InitPageOperation.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/InsertOperation.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/InvalidatePageOperation.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/LogicalPageOperation.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/LogicalUndoOperation.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PageBasicOperation.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PhysicalPageOperation.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PhysicalUndoOperation.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PurgeOperation.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/UpdateFieldOperation.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/UpdateOperation.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/ChecksumOperation.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/FileLogger.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogRecord.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogToFile.java

Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/javadoc/DiskLayoutTaglet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyBuild/javadoc/DiskLayoutTaglet.java?rev=1037009&r1=1037008&r2=1037009&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/javadoc/DiskLayoutTaglet.java (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/javadoc/DiskLayoutTaglet.java Fri Nov 19 20:23:01 2010
@@ -26,7 +26,7 @@ import com.sun.javadoc.*;
 import java.util.Map;
 
 public class DiskLayoutTaglet implements Taglet {
-    private String NAME = "disk_layout";
+    private String NAME = "derby.diskLayout";
     private String ROWNAME = "Disk Layout";
     /**
      * Returns the name of this taglet

Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/javadoc/EndFormatTaglet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyBuild/javadoc/EndFormatTaglet.java?rev=1037009&r1=1037008&r2=1037009&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/javadoc/EndFormatTaglet.java (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/javadoc/EndFormatTaglet.java Fri Nov 19 20:23:01 2010
@@ -25,7 +25,7 @@ import com.sun.javadoc.*;
 import java.util.Map;
 
 public class EndFormatTaglet implements Taglet {
-    private String NAME = "end_format";
+    private String NAME = "derby.endFormat";
     private String ROWNAME = "end_format";
 
     /**

Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/javadoc/FormatIdTaglet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyBuild/javadoc/FormatIdTaglet.java?rev=1037009&r1=1037008&r2=1037009&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/javadoc/FormatIdTaglet.java (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/javadoc/FormatIdTaglet.java Fri Nov 19 20:23:01 2010
@@ -26,7 +26,7 @@ import java.util.Map;
 
 public class FormatIdTaglet implements Taglet {
 
-    private String NAME = "format_id";
+    private String NAME = "derby.formatId";
     private String ROWNAME = "Format ID";
 
     /**

Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/javadoc/PurposeTaglet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyBuild/javadoc/PurposeTaglet.java?rev=1037009&r1=1037008&r2=1037009&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/javadoc/PurposeTaglet.java (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/javadoc/PurposeTaglet.java Fri Nov 19 20:23:01 2010
@@ -26,7 +26,7 @@ import java.util.Map;
 
 public class PurposeTaglet implements Taglet {
 
-    private String NAME = "purpose";
+    private String NAME = "derby.purpose";
     private String ROWNAME = "Purpose";
 
     /**

Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/javadoc/UpgradeTaglet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyBuild/javadoc/UpgradeTaglet.java?rev=1037009&r1=1037008&r2=1037009&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/javadoc/UpgradeTaglet.java (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/javadoc/UpgradeTaglet.java Fri Nov 19 20:23:01 2010
@@ -26,7 +26,7 @@ import com.sun.javadoc.*;
 import java.util.Map;
 
 public class UpgradeTaglet implements Taglet {
-    private String NAME = "upgrade";
+    private String NAME = "derby.upgrade";
     private String ROWNAME = "Upgrade";
 
     /**

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BranchControlRow.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BranchControlRow.java?rev=1037009&r1=1037008&r2=1037009&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BranchControlRow.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BranchControlRow.java Fri Nov 19 20:23:01 2010
@@ -45,15 +45,15 @@ import org.apache.derby.iapi.types.SQLLo
 import org.apache.derby.iapi.services.io.FormatableBitSet;
 
 /**
- * @format_id ACCESS_BTREE_BRANCHCONTROLROW_V1_ID
+ * @derby.formatId ACCESS_BTREE_BRANCHCONTROLROW_V1_ID
  *
- * @purpose    Btree pages all have a control row at the front of every page.
+ * @derby.purpose    Btree pages all have a control row at the front of every page.
  *             To determine the type of row, read the first column which is a
  *             format id and it tells what kind of control row it is.
  *
- * @upgrade    RESOLVE.
+ * @derby.upgrade    RESOLVE.
  *
- * @disk_layout
+ * @derby.diskLayout
  * column 1 - control row type         : StorableFormatId
  * column 2 - left sibling page number : SQLLongint
  * column 3 - right sibling page number: SQLLongint

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/LeafControlRow.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/LeafControlRow.java?rev=1037009&r1=1037008&r2=1037009&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/LeafControlRow.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/LeafControlRow.java Fri Nov 19 20:23:01 2010
@@ -41,15 +41,15 @@ import org.apache.derby.iapi.types.DataV
 import org.apache.derby.iapi.services.io.FormatableBitSet;
 
 /**
- * @format_id ACCESS_BTREE_LEAFCONTROLROW_V1_ID
+ * @derby.formatId ACCESS_BTREE_LEAFCONTROLROW_V1_ID
  *
- * @purpose   Btree pages all have a control row at the front of every page.  To
+ * @derby.purpose   Btree pages all have a control row at the front of every page.  To
  *            determine the type of row, read the first column which is a format
  *            id and it tells what kind of control row it is.
  *
- * @upgrade   This format was made obsolete in the kimono release.
+ * @derby.upgrade   This format was made obsolete in the kimono release.
  *
- * @disk_layout 
+ * @derby.diskLayout 
  * column 1 - control row type         : StorableFormatId
  * column 2 - left sibling page number : SQLLongint
  * column 3 - right sibling page number: SQLLongint

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2I.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2I.java?rev=1037009&r1=1037008&r2=1037009&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2I.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2I.java Fri Nov 19 20:23:01 2010
@@ -76,9 +76,9 @@ import org.apache.derby.iapi.store.acces
 
 
 /*
- * @format_id ACCESS_B2I_V3_ID
+ * @derby.formatId ACCESS_B2I_V3_ID
  *
- * @purpose   The tag that describes the on disk representation of the B2I
+ * @derby.purpose   The tag that describes the on disk representation of the B2I
  *            conglomerate object.  Access contains no "directory" of 
  *            conglomerate information.  In order to bootstrap opening a file
  *            it encodes the factory that can open the conglomerate in the 
@@ -88,7 +88,7 @@ import org.apache.derby.iapi.store.acces
  *            This format was used for all Derby database B2I's in version
  *            10.2 and previous versions.
  *
- * @upgrade   The format id of this object is currently always read from disk
+ * @derby.upgrade   The format id of this object is currently always read from disk
  *            as the first field of the conglomerate itself.  A bootstrap
  *            problem exists as we don't know the format id of the B2I 
  *            until we are in the "middle" of reading the B2I.  Thus the
@@ -120,7 +120,7 @@ import org.apache.derby.iapi.store.acces
  *                    upgrade.  Old conglomerates continue to be handled the
  *                    same as soft upgrade.
  *
- * @disk_layout 
+ * @derby.diskLayout 
  *     format_of_this_conlgomerate(byte[])
  *     containerid(long)
  *     segmentid(int)
@@ -136,9 +136,9 @@ import org.apache.derby.iapi.store.acces
  */
 
 /*
- * @format_id ACCESS_B2I_V4_ID
+ * @derby.formatId ACCESS_B2I_V4_ID
  *
- * @purpose   The tag that describes the on disk representation of the B2I
+ * @derby.purpose   The tag that describes the on disk representation of the B2I
  *            conglomerate object.  Access contains no "directory" of 
  *            conglomerate information.  In order to bootstrap opening a file
  *            it encodes the factory that can open the conglomerate in the 
@@ -147,7 +147,7 @@ import org.apache.derby.iapi.store.acces
  *
  *            This format was used for all Derby database B2I's in version 10.3.
  *
- * @upgrade   The format id of this object is currently always read from disk
+ * @derby.upgrade   The format id of this object is currently always read from disk
  *            as the first field of the conglomerate itself.  A bootstrap
  *            problem exists as we don't know the format id of the B2I 
  *            until we are in the "middle" of reading the B2I.  Thus the
@@ -181,7 +181,7 @@ import org.apache.derby.iapi.store.acces
  *                    upgrade.  Old conglomerates continue to be handled the
  *                    same as soft upgrade.
  *
- * @disk_layout 
+ * @derby.diskLayout 
  *     format_of_this_conlgomerate(byte[])
  *     containerid(long)
  *     segmentid(int)
@@ -198,9 +198,9 @@ import org.apache.derby.iapi.store.acces
  */
 
 /*
- * @format_id ACCESS_B2I_V5_ID
+ * @derby.formatId ACCESS_B2I_V5_ID
  *
- * @purpose   The tag that describes the on disk representation of the B2I
+ * @derby.purpose   The tag that describes the on disk representation of the B2I
  *            conglomerate object.  Access contains no "directory" of 
  *            conglomerate information.  In order to bootstrap opening a file
  *            it encodes the factory that can open the conglomerate in the 
@@ -210,9 +210,9 @@ import org.apache.derby.iapi.store.acces
  *            This format is the current version id of B2I and has been used 
  *            in versions of Derby after the 10.3 release.
  *
- * @upgrade   This is the current version, no upgrade necessary.
+ * @derby.upgrade   This is the current version, no upgrade necessary.
  *
- * @disk_layout 
+ * @derby.diskLayout 
  *     format_of_this_conlgomerate(byte[])
  *     containerid(long)
  *     segmentid(int)

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IUndo.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IUndo.java?rev=1037009&r1=1037008&r2=1037009&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IUndo.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IUndo.java Fri Nov 19 20:23:01 2010
@@ -60,15 +60,15 @@ import java.io.ObjectOutput;
 import org.apache.derby.iapi.services.io.LimitObjectInput;
 
 /**
- * @format_id ACCESS_B2IUNDO_V1_ID
+ * @derby.formatId ACCESS_B2IUNDO_V1_ID
  *
- * @purpose   Implements the LogicalUndo and Formatable interfaces, basically
+ * @derby.purpose   Implements the LogicalUndo and Formatable interfaces, basically
  *            providing a way for raw store recovery to "call back" access code
  *            to provide logical undo ability.
  *
- * @upgrade   RESOLVE.
+ * @derby.upgrade   RESOLVE.
  *
- * @disk_layout 
+ * @derby.diskLayout 
  *     No state associated with this format.
  *
  **/

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2I_10_3.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2I_10_3.java?rev=1037009&r1=1037008&r2=1037009&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2I_10_3.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2I_10_3.java Fri Nov 19 20:23:01 2010
@@ -26,9 +26,9 @@ import java.io.ObjectOutput;
 import org.apache.derby.iapi.services.io.StoredFormatIds;
 
 /*
- * @format_id ACCESS_B2I_V4_ID
+ * @derby.formatId ACCESS_B2I_V4_ID
  *
- * @purpose   The tag that describes the on disk representation of the B2I
+ * @derby.purpose   The tag that describes the on disk representation of the B2I
  *            conglomerate object.  Access contains no "directory" of 
  *            conglomerate information.  In order to bootstrap opening a file
  *            it encodes the factory that can open the conglomerate in the 
@@ -37,7 +37,7 @@ import org.apache.derby.iapi.services.io
  *
  *            This format was used for all Derby database B2I's in version 10.3.
  *
- * @upgrade   The format id of this object is currently always read from disk
+ * @derby.upgrade   The format id of this object is currently always read from disk
  *            as the first field of the conglomerate itself.  A bootstrap
  *            problem exists as we don't know the format id of the B2I 
  *            until we are in the "middle" of reading the B2I.  Thus the
@@ -71,7 +71,7 @@ import org.apache.derby.iapi.services.io
  *                    upgrade.  Old conglomerates continue to be handled the
  *                    same as soft upgrade.
  *
- * @disk_layout 
+ * @derby.diskLayout 
  *     format_of_this_conlgomerate(byte[])
  *     containerid(long)
  *     segmentid(int)

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2I_v10_2.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2I_v10_2.java?rev=1037009&r1=1037008&r2=1037009&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2I_v10_2.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2I_v10_2.java Fri Nov 19 20:23:01 2010
@@ -32,9 +32,9 @@ import java.lang.ClassNotFoundException;
 
 
 /*
- * @format_id ACCESS_B2I_V3_ID
+ * @derby.formatId ACCESS_B2I_V3_ID
  *
- * @purpose   The tag that describes the on disk representation of the B2I
+ * @derby.purpose   The tag that describes the on disk representation of the B2I
  *            conglomerate object.  Access contains no "directory" of 
  *            conglomerate information.  In order to bootstrap opening a file
  *            it encodes the factory that can open the conglomerate in the 
@@ -44,7 +44,7 @@ import java.lang.ClassNotFoundException;
  *            This format was used for all Derby database B2I's in version
  *            10.2 and previous versions.
  *
- * @upgrade   The format id of this object is currently always read from disk
+ * @derby.upgrade   The format id of this object is currently always read from disk
  *            as the first field of the conglomerate itself.  A bootstrap
  *            problem exists as we don't know the format id of the B2I 
  *            until we are in the "middle" of reading the B2I.  Thus the
@@ -76,7 +76,7 @@ import java.lang.ClassNotFoundException;
  *                    upgrade.  Old conglomerates continue to be handled the
  *                    same as soft upgrade.
  *
- * @disk_layout 
+ * @derby.diskLayout 
  *     format_of_this_conlgomerate(byte[])
  *     containerid(long)
  *     segmentid(int)

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/Heap.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/Heap.java?rev=1037009&r1=1037008&r2=1037009&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/Heap.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/Heap.java Fri Nov 19 20:23:01 2010
@@ -75,9 +75,9 @@ import org.apache.derby.impl.store.acces
 import org.apache.derby.impl.store.access.conglomerate.OpenConglomerateScratchSpace;
 
 /**
- * @format_id ACCESS_HEAP_V2_ID
+ * @derby.formatId ACCESS_HEAP_V2_ID
  *
- * @purpose   The tag that describes the on disk representation of the Heap
+ * @derby.purpose   The tag that describes the on disk representation of the Heap
  *            conglomerate object.  Access contains no "directory" of 
  *            conglomerate information.  In order to bootstrap opening a file
  *            it encodes the factory that can open the conglomerate in the 
@@ -87,7 +87,7 @@ import org.apache.derby.impl.store.acces
  *            This format was used for all Derby database Heap's in version
  *            10.2 and previous versions.
  *
- * @upgrade   The format id of this object is currently always read from disk
+ * @derby.upgrade   The format id of this object is currently always read from disk
  *            as the first field of the conglomerate itself.  A bootstrap
  *            problem exists as we don't know the format id of the heap 
  *            until we are in the "middle" of reading the Heap.  Thus the
@@ -119,7 +119,7 @@ import org.apache.derby.impl.store.acces
  *                    upgrade.  Old conglomerates continue to be handled the
  *                    same as soft upgrade.
  *
- * @disk_layout
+ * @derby.diskLayout
  *     format_of_this_conlgomerate(byte[])
  *     containerid(long)
  *     segmentid(int)
@@ -128,13 +128,13 @@ import org.apache.derby.impl.store.acces
  **/
 
 /**
- * @format_id ACCESS_HEAP_V3_ID
+ * @derby.formatId ACCESS_HEAP_V3_ID
  *
- * @purpose   The tag that describes the on disk representation of the Heap
+ * @derby.purpose   The tag that describes the on disk representation of the Heap
  *            conglomerate object.  The Heap conglomerate object is stored in
  *            a field of a row in the Conglomerate directory.
  *
- * @purpose   The tag that describes the on disk representation of the Heap
+ * @derby.purpose   The tag that describes the on disk representation of the Heap
  *            conglomerate object.  Access contains no "directory" of 
  *            conglomerate information.  In order to bootstrap opening a file
  *            it encodes the factory that can open the conglomerate in the 
@@ -146,9 +146,9 @@ import org.apache.derby.impl.store.acces
  *            ACCESS_HEAP_V2_ID format, followed by a compressed representation
  *            of the collation id's of each column in the heap.
  *
- * @upgrade   This is the current version, no upgrade necessary.
+ * @derby.upgrade   This is the current version, no upgrade necessary.
  *
- * @disk_layout
+ * @derby.diskLayout
  *     format_of_this_conlgomerate(byte[])
  *     containerid(long)
  *     segmentid(int)

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapRowLocation.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapRowLocation.java?rev=1037009&r1=1037008&r2=1037009&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapRowLocation.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapRowLocation.java Fri Nov 19 20:23:01 2010
@@ -47,18 +47,18 @@ import java.io.IOException;
  * <P>
  * It is implementad as a wrapper around a raw store record handle.
  * 
- * @format_id ACCESS_HEAP_ROW_LOCATION_V1_ID
+ * @derby.formatId ACCESS_HEAP_ROW_LOCATION_V1_ID
  *
- * @purpose   Object used to store the location of a row within a Heap table.  
+ * @derby.purpose   Object used to store the location of a row within a Heap table.  
  *            One of these is stored in every row of a btree secondary index 
  *            built on a heap base table.
  *
- * @upgrade   The type of the btree determines the type of rowlocation stored.
+ * @derby.upgrade   The type of the btree determines the type of rowlocation stored.
  *            In current btree implementations only one type of rowlocation can
  *            be stored per tree, and it's type is stored in the format id 
  *            array stored in the Conglomerate object.
  *
- * @disk_layout 
+ * @derby.diskLayout 
  *     page number(CompressedNumber.writeLong())
  *     record id(CompressedNumber.writeInt())
  **/

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/Heap_v10_2.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/Heap_v10_2.java?rev=1037009&r1=1037008&r2=1037009&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/Heap_v10_2.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/Heap_v10_2.java Fri Nov 19 20:23:01 2010
@@ -32,9 +32,9 @@ import java.lang.ClassNotFoundException;
 
 
 /**
- * @format_id ACCESS_HEAP_V2_ID
+ * @derby.formatId ACCESS_HEAP_V2_ID
  *
- * @purpose   The tag that describes the on disk representation of the Heap
+ * @derby.purpose   The tag that describes the on disk representation of the Heap
  *            conglomerate object.  Access contains no "directory" of 
  *            conglomerate information.  In order to bootstrap opening a file
  *            it encodes the factory that can open the conglomerate in the 
@@ -44,7 +44,7 @@ import java.lang.ClassNotFoundException;
  *            This format was used for all Derby database Heap's in version
  *            10.2 and previous versions.
  *
- * @upgrade   The format id of this object is currently always read from disk
+ * @derby.upgrade   The format id of this object is currently always read from disk
  *            as the first field of the conglomerate itself.  A bootstrap
  *            problem exists as we don't know the format id of the heap 
  *            until we are in the "middle" of reading the Heap.  Thus the
@@ -76,7 +76,7 @@ import java.lang.ClassNotFoundException;
  *                    upgrade.  Old conglomerates continue to be handled the
  *                    same as soft upgrade.
  *
- * @disk_layout
+ * @derby.diskLayout
  *     format_of_this_conlgomerate(byte[])
  *     containerid(long)
  *     segmentid(int)

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/AllocExtent.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/AllocExtent.java?rev=1037009&r1=1037008&r2=1037009&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/AllocExtent.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/AllocExtent.java Fri Nov 19 20:23:01 2010
@@ -41,10 +41,10 @@ import java.io.ObjectInput;
 	without being converted to a row first.
 	<P>
 	<PRE>
-	@format_id	none, format implied by AllocPage's format
-	@purpose	manage page status of page in extent
-	@upgrade
-	@disk_layout
+	@derby.formatId	none, format implied by AllocPage's format
+	@derby.purpose	manage page status of page in extent
+	@derby.upgrade
+	@derby.diskLayout
 		extentOffset(long) the begin physical byte offset of the first page of this extent
 		extentStart(long) the first logical page mananged by this extent.
 		extentEnd(long) the last page this extent can ever hope to manage 
@@ -93,7 +93,7 @@ import java.io.ObjectInput;
 		org.apache.derby.iapi.services.io.FormatableBitSet is used to store the bit map.  
             FormatableBitSet is an externalizable class.
 
-	@end_format
+	@derby.endFormat
 
 	<PRE>
 	A page can have the following logical state:

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/AllocPage.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/AllocPage.java?rev=1037009&r1=1037008&r2=1037009&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/AllocPage.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/AllocPage.java Fri Nov 19 20:23:01 2010
@@ -104,10 +104,10 @@ import org.apache.derby.iapi.services.io
 	<P>
 	The following fields are stored in the page header
 	<PRE>
-	@format_id	RAW_STORE_ALLOC_PAGE
-	@purpose	manage page allocation
-	@upgrade
-	@disk_layout
+	@derby.formatId	RAW_STORE_ALLOC_PAGE
+	@derby.purpose	manage page allocation
+	@derby.upgrade
+	@derby.diskLayout
 		FormatId(int)
 		StoredPageHeader	see StoredPage
 		nextAllocPageNubmer(long)	the next allocation page's number
@@ -120,7 +120,7 @@ import org.apache.derby.iapi.services.io
 		containerInfo(byte[N])		the content of the borrowed container info
 		AllocExtent					the one and only extent on this alloc page
 
-	@end_format
+	@derby.endFormat
 	</PRE>
 
 	<P>

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/CopyRowsOperation.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/CopyRowsOperation.java?rev=1037009&r1=1037008&r2=1037009&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/CopyRowsOperation.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/CopyRowsOperation.java Fri Nov 19 20:23:01 2010
@@ -53,12 +53,12 @@ import org.apache.derby.iapi.services.io
 	Represents copying num_rows from one page to another page.
 
 	<PRE>
-	@format_id	LOGOP_COPY_ROWS
+	@derby.formatId	LOGOP_COPY_ROWS
 		the formatId is written by FormatIdOutputStream when this object is
 		written out by writeObject
-	@purpose	copy some rows from one page to another
-	@upgrade
-	@disk_layout
+	@derby.purpose	copy some rows from one page to another
+	@derby.upgrade
+	@derby.diskLayout
 		PhysicalPageOperation the superclass
 		num_rows(CompressedInt)	number of rows to copy
 		destSlot(CompressedInt)	the first slot number at the destination page
@@ -66,7 +66,7 @@ import org.apache.derby.iapi.services.io
 
 		OptionalData	the after image of the rows to be inserted into the
 						destination page
-	@end_format
+	@derby.endFormat
 	</PRE>
 */
 public class CopyRowsOperation extends PhysicalPageOperation {

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/DeleteOperation.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/DeleteOperation.java?rev=1037009&r1=1037008&r2=1037009&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/DeleteOperation.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/DeleteOperation.java Fri Nov 19 20:23:01 2010
@@ -59,12 +59,12 @@ import org.apache.derby.iapi.services.io
 	Represents a delete (or undelete) of a record in a page.
 
 	<PRE>
-	@format_id	LOGOP_DELETE
+	@derby.formatId	LOGOP_DELETE
 		the formatId is written by FormatIdOutputStream when this object is
 		written out by writeObject
-	@purpose	delete a record from a page.
-	@upgrade
-	@disk_layout
+	@derby.purpose	delete a record from a page.
+	@derby.upgrade
+	@derby.diskLayout
 		LogicalPageOperation	the super class
 		doMeSlot(CompressedInt)	the slot of the record to delete
 		delete(boolean)			if true, delete, else undelete
@@ -72,7 +72,7 @@ import org.apache.derby.iapi.services.io
 		OptionalData		if we need logical undo, write the row that was
 							deleted as the optional data.  If we don't need
 							logical undo, no optional data
-	@end_format
+	@derby.endFormat
 	</PRE>
 */
 public final class DeleteOperation extends LogicalPageOperation

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/EncryptContainerOperation.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/EncryptContainerOperation.java?rev=1037009&r1=1037008&r2=1037009&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/EncryptContainerOperation.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/EncryptContainerOperation.java Fri Nov 19 20:23:01 2010
@@ -49,14 +49,14 @@ import org.apache.derby.iapi.services.io
  * container is put back during undo. 
  *
  * <PRE>
- *  @format_id	LOGOP_ENCRYPT_CONTAINER
+ *  @derby.formatId	LOGOP_ENCRYPT_CONTAINER
  * 	the formatId is written by FormatIdOutputStream when this object is
  *	written out by writeObject
- * @purpose to record enctyption of container with a new encryption key.
- * @upgrade
- * @disk_layout
+ * @derby.purpose to record enctyption of container with a new encryption key.
+ * @derby.upgrade
+ * @derby.diskLayout
  *      containerId(ContainerKey)  the id of the container this operation applies to
- *	@end_format
+ *	@derby.endFormat
  *  </PRE>
  *
  *  @see Undoable

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/InitPageOperation.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/InitPageOperation.java?rev=1037009&r1=1037008&r2=1037009&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/InitPageOperation.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/InitPageOperation.java Fri Nov 19 20:23:01 2010
@@ -48,19 +48,19 @@ import org.apache.derby.iapi.services.io
 	this operation does not change the alloc page information.
 
 	<PRE>
-	@format_id	LOGOP_INIT_PAGE
+	@derby.formatId	LOGOP_INIT_PAGE
 		the formatId is written by FormatIdOutputStream when this object is
 		written out by writeObject
-	@purpose	initialized a page
-	@upgrade
-	@disk_layout
+	@derby.purpose	initialized a page
+	@derby.upgrade
+	@derby.diskLayout
 		PhysicalPageOperation the superclass
 		nextRecordId(CompressedInt)	the next recordId this page should give out
 		initFlag(CompressedInt)		initialization flag: reuse, overflow
 		pageformat(int)				the page's formatId
 
 		OptionalData	none
-	@end_format
+	@derby.endFormat
 	</PRE>
 */
 public final class InitPageOperation extends PhysicalPageOperation

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/InsertOperation.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/InsertOperation.java?rev=1037009&r1=1037008&r2=1037009&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/InsertOperation.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/InsertOperation.java Fri Nov 19 20:23:01 2010
@@ -61,18 +61,18 @@ import org.apache.derby.iapi.services.io
 	Represents an insert of a record onto a page.
 
 	<PRE>
-	@format_id	LOGOP_INSERT
+	@derby.formatId	LOGOP_INSERT
 		the formatId is written by FormatIdOutputStream when this object is
 		written out by writeObject
-	@purpose	insert a row onto a page
-	@upgrade
-	@disk_layout
+	@derby.purpose	insert a row onto a page
+	@derby.upgrade
+	@derby.diskLayout
 		LogicalPageOperation the superclass
 		doMeSlot(CompressedInt) which slot to operate on
 		insertFlat(byte)		to undo with purge or with delete
 
 		OptionalData	The after image of the row to be inserted.
-	@end_format
+	@derby.endFormat
 	</PRE>
     @see Page#insertAtSlot
 */

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/InvalidatePageOperation.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/InvalidatePageOperation.java?rev=1037009&r1=1037008&r2=1037009&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/InvalidatePageOperation.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/InvalidatePageOperation.java Fri Nov 19 20:23:01 2010
@@ -46,15 +46,15 @@ import org.apache.derby.iapi.services.io
 	to deallocatePage that happens on the alloc page.
 
 	<PRE>
-	@format_id	LOGOP_INVALIDATE_PAGE
+	@derby.formatId	LOGOP_INVALIDATE_PAGE
 		the formatId is written by FormatIdOutputStream when this object is
 		written out by writeObject
-	@purpose	invalidate a page
-	@upgrade
-	@disk_layout
+	@derby.purpose	invalidate a page
+	@derby.upgrade
+	@derby.diskLayout
 		PhysicalPageOperation the superclass
 		OptionalData	none
-	@end_format
+	@derby.endFormat
 	</PRE>
 */
 public final class InvalidatePageOperation extends PhysicalPageOperation

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/LogicalPageOperation.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/LogicalPageOperation.java?rev=1037009&r1=1037008&r2=1037009&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/LogicalPageOperation.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/LogicalPageOperation.java Fri Nov 19 20:23:01 2010
@@ -58,16 +58,16 @@ import org.apache.derby.iapi.services.io
 	different page than the original operation.
 
 	<PRE>
-	@format_id	no format id, an abstract class.
-	@purpose	provide methods for logical undo
-	@upgrade
-	@disk_layout
+	@derby.formatId	no format id, an abstract class.
+	@derby.purpose	provide methods for logical undo
+	@derby.upgrade
+	@derby.diskLayout
 		PageBasicOperation	the super class
 		recordId(CompressedInt)	the recordId this operation affects
 		undo(LogicalUndo)		the piece of code that can figure out which page 
 								the row has moved into
 		OptionalData	none
-	@end_format
+	@derby.endFormat
 	</PRE>
 
 */

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/LogicalUndoOperation.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/LogicalUndoOperation.java?rev=1037009&r1=1037008&r2=1037009&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/LogicalUndoOperation.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/LogicalUndoOperation.java Fri Nov 19 20:23:01 2010
@@ -52,18 +52,18 @@ import org.apache.derby.iapi.services.io
 	it is loggable but not undoable.
 
 	<PRE>
-	@format_id	LOGOP_PAGE_LOGICAL_UNDO
+	@derby.formatId	LOGOP_PAGE_LOGICAL_UNDO
 		the formatId is written by FormatIdOutputStream when this object is
 		written out by writeObject
-	@purpose	undo a logical log operation 
-	@upgrade
-	@disk_layout
+	@derby.purpose	undo a logical log operation 
+	@derby.upgrade
+	@derby.diskLayout
 		PageBasicOperation	the super class
 		recordId(CompressedInt) the recordId of the changed row (this may not
 				be the recordId during rollback if the record moved from one
 				page to another) 
 		OptionalData	none (compensation operation never have optional data)
-	@end_format
+	@derby.endFormat
 	</PRE>
 
 */

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PageBasicOperation.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PageBasicOperation.java?rev=1037009&r1=1037008&r2=1037009&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PageBasicOperation.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PageBasicOperation.java Fri Nov 19 20:23:01 2010
@@ -66,14 +66,14 @@ import org.apache.derby.iapi.services.io
 	LogOperation, the page that needs roll back must be determined.
 
 	<PRE>
-	@format_id	no format id, an abstract class.
-	@purpose	provide methods for logical undo
-	@upgrade
-	@disk_layout
+	@derby.formatId	no format id, an abstract class.
+	@derby.purpose	provide methods for logical undo
+	@derby.upgrade
+	@derby.diskLayout
 		pageId(PageKey)			the page this operation applies to
 		pageVersion(CompressedLong)	the page version this operation applied to
 		OptionalData	none
-	@end_format
+	@derby.endFormat
 	</PRE>
 
 	@see Loggable

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PhysicalPageOperation.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PhysicalPageOperation.java?rev=1037009&r1=1037008&r2=1037009&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PhysicalPageOperation.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PhysicalPageOperation.java Fri Nov 19 20:23:01 2010
@@ -47,12 +47,12 @@ import org.apache.derby.iapi.services.io
 	of the row(s) affected).
 
 	<PRE>
-	@format_id	no format id, an abstract class.
-	@purpose	provide methods for physical undo
-	@upgrade
-	@disk_layout
+	@derby.formatId	no format id, an abstract class.
+	@derby.purpose	provide methods for physical undo
+	@derby.upgrade
+	@derby.diskLayout
 		PageBasicOperation	the super class
-	@end_format
+	@derby.endFormat
 	</PRE>
 */
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PhysicalUndoOperation.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PhysicalUndoOperation.java?rev=1037009&r1=1037008&r2=1037009&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PhysicalUndoOperation.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PhysicalUndoOperation.java Fri Nov 19 20:23:01 2010
@@ -50,15 +50,15 @@ import org.apache.derby.iapi.services.io
 	it is loggable but not undoable.
 
 	<PRE>
-	@format_id	LOGOP_PAGE_PHYSICAL_UNDO
+	@derby.formatId	LOGOP_PAGE_PHYSICAL_UNDO
 		the formatId is written by FormatIdOutputStream when this object is
 		written out by writeObject
-	@purpose	update a physiacl log operation
-	@upgrade
-	@disk_layout
+	@derby.purpose	update a physiacl log operation
+	@derby.upgrade
+	@derby.diskLayout
 		PageBasicOperation	the super class
 		OptionalData	none (compensation operation never have optional data)
-	@end_format
+	@derby.endFormat
 	</PRE>
 
 */

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PurgeOperation.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PurgeOperation.java?rev=1037009&r1=1037008&r2=1037009&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PurgeOperation.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PurgeOperation.java Fri Nov 19 20:23:01 2010
@@ -57,19 +57,19 @@ import org.apache.derby.iapi.services.io
 	Represents purging of a range of rows from the page.
 
 	<PRE>
-	@format_id	LOGOP_PURGE
+	@derby.formatId	LOGOP_PURGE
 		the formatId is written by FormatIdOutputStream when this object is
 		written out by writeObject
-	@purpose	purge num_rows from the page
-	@upgrade
-	@disk_layout
+	@derby.purpose	purge num_rows from the page
+	@derby.upgrade
+	@derby.diskLayout
 		PagePhysicalOperation	the super class
 		slot(CompressedInt)	the slot to start purging
 		num_rows(CompressedInt)	number of rows rows to purge
 		recordIds(CompressedInt[num_rows]) the recordIds of the purged rows
 
 		OptionalData	the before images of the rows that were purged
-	@end_format
+	@derby.endFormat
 	</PRE>
 
    @see Page#purgeAtSlot

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/UpdateFieldOperation.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/UpdateFieldOperation.java?rev=1037009&r1=1037008&r2=1037009&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/UpdateFieldOperation.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/UpdateFieldOperation.java Fri Nov 19 20:23:01 2010
@@ -59,12 +59,12 @@ import org.apache.derby.iapi.services.io
 	Represents the update of a particular field of a row on a page.
 
 	<PRE>
-	@format_id	LOGOP_UPDATE_FIELD
+	@derby.formatId	LOGOP_UPDATE_FIELD
 		the formatId is written by FormatIdOutputStream when this object is
 		written out by writeObject
-	@purpose	update a field of a record on the page
-	@upgrade
-	@disk_layout
+	@derby.purpose	update a field of a record on the page
+	@derby.upgrade
+	@derby.diskLayout
 		LogicalPageOperation	the super class
 		doMeSlot(CompressedInt) the slot of the record being updated
 		fieldId(CompressedInt)	the recordId of the record being updated
@@ -73,7 +73,7 @@ import org.apache.derby.iapi.services.io
 						follow by the old image of the record (length
 						included).  If this is logically undoable, then the
 						before image of the entire row is logged
-	@end_format
+	@derby.endFormat
 	</PRE>
 */
 public final class UpdateFieldOperation extends LogicalPageOperation 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/UpdateOperation.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/UpdateOperation.java?rev=1037009&r1=1037008&r2=1037009&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/UpdateOperation.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/UpdateOperation.java Fri Nov 19 20:23:01 2010
@@ -58,19 +58,19 @@ import org.apache.derby.iapi.services.io
 	Represents the update of a particular row on a page.
 
 	<PRE>
-	@format_id	LOGOP_UPDATE
+	@derby.formatId	LOGOP_UPDATE
 		the formatId is written by FormatIdOutputStream when this object is
 		written out by writeObject
-	@purpose	update a record on the page
-	@upgrade
-	@disk_layout
+	@derby.purpose	update a record on the page
+	@derby.upgrade
+	@derby.diskLayout
 		PhysicalPageOperation	the super class
 		doMeSlot(CompressedInt)	the slot the updated record is in
 		recordId(CompressedInt) the recordId of the updated record
 
 		OptionalData	The new image of the record (length included), 
 						follow by the old image of the record (length included)
-	@end_format
+	@derby.endFormat
 	</PRE>
 */
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/ChecksumOperation.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/ChecksumOperation.java?rev=1037009&r1=1037008&r2=1037009&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/ChecksumOperation.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/ChecksumOperation.java Fri Nov 19 20:23:01 2010
@@ -55,16 +55,16 @@ import java.util.zip.CRC32;
 	that are written to the tranaction log file.
 
 	<PRE>
-	@format_id	LOGOP_CHECKSUM
+	@derby.formatId	LOGOP_CHECKSUM
 		the formatId is written by FormatIdOutputStream when this object is
 		written out by writeObject
-	@purpose  checksum one or more log records while writing to disk
-	@upgrade
-	@disk_layout
+	@derby.purpose  checksum one or more log records while writing to disk
+	@derby.upgrade
+	@derby.diskLayout
 		checksumAlgo(byte)  	the checksum algorithm 
 		checksumValue(long)     the checksum value 
 		dataLength(int)			number of bytes that the checksum is calculated
-	@end_format
+	@derby.endFormat
 	</PRE>
 
 	@see Loggable

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/FileLogger.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/FileLogger.java?rev=1037009&r1=1037008&r2=1037009&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/FileLogger.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/FileLogger.java Fri Nov 19 20:23:01 2010
@@ -71,25 +71,25 @@ import org.apache.derby.impl.store.raw.d
 <P>
 	The format of a log record that is not a compensation operation is
 	<PRE>
-	@format_id	no formatId, format is implied by the log file format and the
+	@derby.formatId	no formatId, format is implied by the log file format and the
 		log record content.
-	@purpose	the log record and optional data
-	@upgrade
-	@disk_layout
+	@derby.purpose	the log record and optional data
+	@derby.upgrade
+	@derby.diskLayout
 		Log Record
 			(see org.apache.derby.impl.store.raw.log.LogRecord)
 		length(int)	length of optional data
 		optionalData(byte[length]) optional data written by the log record
-	@end_format
+	@derby.endFormat
 	</PRE> <HR WIDTH="100%"> 
 
 	<P>	The form of a log record that is a compensation operation is
 	<PRE>
-	@format_id	no formatId, format is implied by the log file format and the
+	@derby.formatId	no formatId, format is implied by the log file format and the
 	log record content.
-	@purpose	undo a previous log record
-	@upgrade
-	@disk_layout
+	@derby.purpose	undo a previous log record
+	@derby.upgrade
+	@derby.diskLayout
 		Log Record that contains the compenstation operation
 			(see org.apache.derby.impl.store.raw.log.LogRecord)
 		undoInstant(long) the log instant of the operation that is to be rolled back
@@ -99,7 +99,7 @@ import org.apache.derby.impl.store.raw.d
 		There is no optional data in a compensation operation, all data
 		necessary for the rollback must be stored in the operation being
 		undone.
-	@end_format
+	@derby.endFormat
 	</PRE>
 
     <BR>

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogRecord.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogRecord.java?rev=1037009&r1=1037008&r2=1037009&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogRecord.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogRecord.java Fri Nov 19 20:23:01 2010
@@ -53,16 +53,16 @@ import java.io.IOException;
 	<P>	<PRE>
 	The format of a log record is
 
-	@format_id LOG_RECORD
+	@derby.formatId LOG_RECORD
 		the formatId is written by FormatIdOutputStream when this object is
 		written out by writeObject
-	@purpose	The log record described every change to the persistent store
-	@upgrade
-	@disk_layout
+	@derby.purpose	The log record described every change to the persistent store
+	@derby.upgrade
+	@derby.diskLayout
 		loggable group(CompressedInt)	the loggable's group value
 		xactId(TransactionId)			The Transaction this log belongs to
 		op(Loggable)					the log operation
-	@end_format
+	@derby.endFormat
 	</PRE>
 
 */

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogToFile.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogToFile.java?rev=1037009&r1=1037008&r2=1037009&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogToFile.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogToFile.java Fri Nov 19 20:23:01 2010
@@ -146,11 +146,11 @@ import java.util.zip.CRC32;
 
 	Format of log control file 
 
-	@format_id	FILE_STREAM_LOG_FILE
-	@purpose	The log control file contains information about which log files
+	@derby.formatId	FILE_STREAM_LOG_FILE
+	@derby.purpose	The log control file contains information about which log files
 	are present and where the last checkpoint log record is located.
-	@upgrade	
-	@disk_layout
+	@derby.upgrade	
+	@derby.diskLayout
 	(pre-v15)
 		int format id
 		int log file version
@@ -165,19 +165,19 @@ import java.util.zip.CRC32;
 		long spare (value set to 0)
 		long spare (value set to 0)
 
-	@end_format
+	@derby.endFormat
 	</PRE>	
 	<HR WIDTH="100%">
 	<PRE>
 
 	Format of the log file
 
-	@format_id	FILE_STREAM_LOG_FILE
-	@purpose	The log file contains log record which record all the changes
+	@derby.formatId	FILE_STREAM_LOG_FILE
+	@derby.purpose	The log file contains log record which record all the changes
 	to the database.  The complete transaction log is composed of a series of
 	log files.
-	@upgrade
-	@disk_layout
+	@derby.upgrade
+	@derby.diskLayout
 		int format id - 	the format Id of this log file
 		int obsolete log file version - not used
 		long log file number - this number orders the log files in a
@@ -191,22 +191,22 @@ import java.util.zip.CRC32;
 				is the length of the log record, therefore it is never zero
 		[int fuzzy end]* zero or more int's of value 0, in case this log file
 				has been recovered and any incomplete log record set to zero.
-	@end_format
+	@derby.endFormat
 	</PRE>	
 	<HR WIDTH="100%">
 	<PRE>
 
 	Format of the log record wrapper
 
-	@format_id none.  The format is implied by the FILE_STREAM_LOG_FILE
-	@purpose	The log record wrapper provides information for the log scan.
-	@upgrade
-	@disk_layout
+	@derby.formatId none.  The format is implied by the FILE_STREAM_LOG_FILE
+	@derby.purpose	The log record wrapper provides information for the log scan.
+	@derby.upgrade
+	@derby.diskLayout
 		length(int) length of the log record (for forward scan)
 		instant(long) LogInstant of the log record
 		logRecord(byte[length]) byte array that is written by the FileLogger
 		length(int) length of the log record (for backward scan)
-	@end_format
+	@derby.endFormat
 	</PRE>
 
 



Mime
View raw message