You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-dev@db.apache.org by ti...@apache.org on 2019/12/02 20:24:20 UTC
[db-jdo-site] 01/02: Removed bad adocs
This is an automated email from the ASF dual-hosted git repository.
tilmannz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/db-jdo-site.git
commit 5a0f548d992bc63380cf6ef700344066334d4fc4
Author: Tilmann <zo...@gmx.de>
AuthorDate: Mon Dec 2 20:20:47 2019 +0000
Removed bad adocs
---
docs/annotations.adoc | 1923 --------------------
docs/annotations.html | 219 ++-
docs/attach_detach.adoc | 264 ---
docs/attach_detach.html | 45 +-
docs/class_types.adoc | 82 -
docs/class_types.html | 33 +-
docs/cvs-usage.adoc | 13 -
docs/cvs-usage.html | 2 +-
docs/dependencies.adoc | 54 -
docs/dependencies.html | 25 +-
docs/downloads.adoc | 61 -
docs/downloads.html | 41 +-
docs/enhancement.adoc | 569 ------
docs/enhancement.html | 25 +-
docs/exceptions.adoc | 99 -
docs/exceptions.html | 37 +-
docs/extents.adoc | 38 -
docs/extents.html | 25 +-
docs/faq.adoc | 42 -
docs/faq.html | 25 +-
docs/fetchgroups.adoc | 309 ----
docs/fetchgroups.html | 49 +-
docs/field_types.adoc | 604 ------
docs/field_types.html | 33 +-
docs/get-involved.adoc | 58 -
docs/get-involved.html | 43 +-
docs/glossary.adoc | 149 --
docs/glossary.html | 25 +-
docs/guides.adoc | 23 -
docs/guides.html | 25 +-
docs/{fetchgroups.html => guides/maven-jdo.html} | 507 +++---
docs/{class_types.html => guides/replication.html} | 181 +-
docs/impls.adoc | 95 -
docs/impls.html | 45 +-
docs/index.adoc | 173 --
docs/index.html | 88 +-
docs/issue-tracking.adoc | 13 -
docs/issue-tracking.html | 2 +-
docs/issuetracking.adoc | 52 -
docs/issuetracking.html | 31 +-
docs/javadoc.adoc | 80 -
docs/javadoc.html | 75 +-
docs/jdo_3_0_overview.adoc | 205 ---
docs/jdo_3_0_overview.html | 47 +-
docs/jdo_dtd.adoc | 56 -
docs/jdo_dtd.html | 27 +-
docs/jdo_v_jpa.adoc | 137 --
docs/jdo_v_jpa.html | 27 +-
docs/jdo_v_jpa_api.adoc | 41 -
docs/jdo_v_jpa_api.html | 25 +-
docs/jdo_v_jpa_orm.adoc | 269 ---
docs/jdo_v_jpa_orm.html | 113 +-
docs/jdocentral.adoc | 32 -
docs/jdocentral.html | 2 +-
docs/jdoconfig_dtd.adoc | 57 -
docs/jdoconfig_dtd.html | 25 +-
docs/jdohelper.adoc | 93 -
docs/jdohelper.html | 39 +-
docs/jdoql.adoc | 257 ---
docs/jdoql.html | 61 +-
docs/jdoql_methods.adoc | 234 ---
docs/jdoql_methods.html | 53 +-
docs/jdoql_result.adoc | 119 --
docs/jdoql_result.html | 37 +-
docs/jdoquery_dtd.adoc | 57 -
docs/jdoquery_dtd.html | 25 +-
docs/mail-lists.adoc | 46 -
docs/mail-lists.html | 25 +-
docs/maven-reports.adoc | 13 -
docs/maven-reports.html | 2 +-
docs/metadata.adoc | 68 -
docs/metadata.html | 33 +-
docs/newshistory.adoc | 30 -
docs/newshistory.html | 25 +-
docs/object_retrieval.adoc | 87 -
docs/object_retrieval.html | 37 +-
docs/orm_dtd.adoc | 57 -
docs/orm_dtd.html | 27 +-
docs/pm.adoc | 235 ---
docs/pm.html | 53 +-
docs/pmf.adoc | 399 ----
docs/pmf.html | 33 +-
docs/project-info.adoc | 13 -
docs/project-info.html | 2 +-
docs/references.adoc | 62 -
docs/references.html | 35 +-
.../release-3.0.1.cgi.html} | 126 +-
.../release-3.1-rc1.cgi.html} | 115 +-
.../release-3.1.cgi.html} | 114 +-
docs/roadmap.adoc | 28 -
docs/roadmap.html | 25 +-
docs/specifications.adoc | 50 -
docs/specifications.html | 35 +-
docs/state_transition.adoc | 203 ---
docs/state_transition.html | 47 +-
docs/svn.adoc | 247 ---
docs/svn.html | 97 +-
docs/tck.adoc | 48 -
docs/tck.html | 43 +-
docs/{issue-tracking.html => tck/final/index.html} | 2 +-
.../final/index.html@C=D;O=A.html} | 2 +-
.../final/index.html@C=M;O=A.html} | 2 +-
.../final/index.html@C=N;O=D.html} | 2 +-
.../final/index.html@C=S;O=A.html} | 2 +-
docs/{issue-tracking.html => tck/index.html} | 2 +-
docs/team-list.adoc | 61 -
docs/team-list.html | 41 +-
docs/transactions.adoc | 64 -
docs/transactions.html | 27 +-
docs/types.adoc | 13 -
docs/types.html | 2 +-
docs/why_jdo.adoc | 144 --
docs/why_jdo.html | 25 +-
113 files changed, 1372 insertions(+), 9797 deletions(-)
diff --git a/docs/annotations.adoc b/docs/annotations.adoc
deleted file mode 100644
index 33c22c1..0000000
--- a/docs/annotations.adoc
+++ /dev/null
@@ -1,1923 +0,0 @@
-[[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
-
-'''''
-
-:_basedir:
-:_imagesdir: images/
-:notoc:
-:titlepage:
-:grid: cols
-
-== JDO : Annotationsanchor:JDO_:_Annotations[]
-
-One of the things that JDK 1.5 provides that can be of some use is
-annotations, and JDO provides its own set. When selecting to use
-annotations please bear in mind the following :-
-
-* You must have the *jdo-api* jar in your CLASSPATH since this provides
-the annotations
-* Annotations should really only be used for attributes of persistence
-that you won't be changing at deployment. Things such as table and
-column names shouldn't really be specified using annotations although it
-is permitted. Instead it would be better to put such information in an
-ORM MetaData file.
-* Annotations can be added in two places - for the class as a whole, or
-for a field in particular.
-* You can annotate fields or getters with field-level information. If
-you annotate fields then the fields are processed for persistence. If
-you annotate the methods (getters) then the methods (properties) are
-processed for persistence.
-* Annotations are prefixed by the @ symbol and can take properties (in
-brackets after the name, comma-separated)
-
-[cols=",,",options="header",]
-|===
-|Annotation |Class/Field/Method |Description
-|xref:PersistenceCapable[@PersistenceCapable] |Class |Specifies that
-the class/interface is persistent. In the case of an interface this
-would utilise JDO2's "persistent-interface" capabilities
-
-|xref:PersistenceAware[@PersistenceAware] |Class |Specifies that the
-class is not persistent but needs to be able to access fields of
-persistent classes
-
-|xref:Cacheable_Class[@Cacheable] |Class |Specifies whether this class
-can be cached in a Level 2 cache or not.
-
-|xref:EmbeddedOnly[@EmbeddedOnly] |Class |Specifies that the class is
-persistent and can only be persisted embedded in another persistent
-class
-
-|xref:DatastoreIdentity[@DatastoreIdentity] |Class |Specifies the
-details for generating datastore-identity for this class
-
-|xref:Version[@Version] |Class |Specifies any versioning process for
-objects of this class
-
-|xref:FetchPlans[@FetchPlans] |Class |Defines a series of fetch plans
-
-|xref:FetchPlan[@FetchPlan] |Class |Defines a fetch plan
-
-|xref:FetchGroups[@FetchGroups] |Class |Defines a series of fetch
-groups for this class
-
-|xref:FetchGroup[@FetchGroup] |Class |Defines a fetch group for this
-class
-
-|xref:Sequence[@Sequence] |Class |Defines a sequence for use by this
-class
-
-|xref:Queries[@Queries] |Class |Defines a series of named queries for
-this class
-
-|xref:Query[@Query] |Class |Defines a named query for this class
-
-|xref:Inheritance[@Inheritance] |Class |Specifies the inheritance model
-for persisting this class
-
-|xref:Discriminator[@Discriminator] |Class |Specifies any discriminator
-for this class to be used for determining object types
-
-|xref:PrimaryKey_Class[@PrimaryKey] |Class |ORM : Defines the primary
-key constraint for this class
-
-|xref:Indices[@Indices] |Class |ORM : Defines a series of indices for
-this class
-
-|xref:Index_Class[@Index] |Class |ORM : Defines an index for the class
-as a whole (typically a composite index)
-
-|xref:Uniques[@Uniques] |Class |ORM : Defines a series of unique
-constraints for this class
-
-|xref:Unique_Class[@Unique] |Class |ORM : Defines a unique constraint
-for the class as a whole (typically a composite)
-
-|xref:ForeignKeys[@ForeignKeys] |Class |ORM : Defines a series of
-foreign-keys (typically for non-mapped columns/tables)
-
-|xref:ForeignKey_Class[@ForeignKey] |Class |ORM : Defines a foreign-key
-for the class as a whole (typically for non-mapped columns/tables)
-
-|xref:Joins[@Joins] |Class |ORM : Defines a series of joins to
-secondary tables from this table
-
-|xref:Join_Class[@Join] |Class |ORM : Defines a join to a secondary
-table from this table
-
-|xref:Columns[@Columns] |Class |ORM : Defines a series of columns that
-dont have associated fields ("unmapped columns")
-
-|xref:Persistent[@Persistent] |Field/Method |Defines the persistence
-for a field/property of the class
-
-|xref:Serialized[@Serialized] |Field/Method |Defines this field as
-being stored serialised
-
-|xref:NotPersistent[@NotPersistent] |Field/Method |Defines this field
-as being not persisted
-
-|xref:Transactional[@Transactional] |Field/Method |Defines this field
-as being transactional (not persisted, but managed)
-
-|xref:Cacheable[@Cacheable] |Field/Method |Specifies whether this
-field/property can be cached in a Level 2 cache or not.
-
-|xref:PrimaryKey[@PrimaryKey] |Field/Method |Defines this field as
-being (part of) the primary key
-
-|xref:Element[@Element] |Field/Method |Defines the details of elements
-of an array/collection stored in this field
-
-|xref:Key[@Key] |Field/Method |Defines the details of keys of a map
-stored in this field
-
-|xref:Value[@Value] |Field/Method |Defines the details of values of a
-map stored in this field
-
-|xref:Order[@Order] |Field/Method |ORM : Defines the details of
-ordering of an array/collection stored in this field
-
-|xref:Join[@Join] |Field/Method |ORM : Defines the join to a join table
-for a collection/array/map
-
-|xref:Embedded[@Embedded] |Field/Method |ORM : Defines that this field
-is embedded and how it is embedded
-
-|xref:Columns[@Columns] |Field/Method |ORM : Defines a series of
-columns where a field is persisted
-
-|xref:Column[@Column] |Field/Method |ORM : Defines a column where a
-field is persisted
-
-|xref:Index[@Index] |Field/Method |ORM : Defines an index for the field
-
-|xref:Unique[@Unique] |Field/Method |ORM : Defines a unique constraint
-for the field
-
-|xref:ForeignKey[@ForeignKey] |Field/Method |ORM : Defines a foreign
-key for the field
-
-|xref:Extensions[@Extensions] |Class/Field/Method |Defines a series of
-JDO extensions
-
-|xref:Extension[@Extension] |Class/Field/Method |Defines a JDO
-extension
-|===
-
-{empty} +
-
-anchor:PersistenceCapable[]
-
-=== @PersistenceCapableanchor:aPersistenceCapable[]
-
-This annotation is used when you want to mark a class as persistent. It
-equates to the <class> MetaData element (though with only some of its
-attributes). Specified on the *class*.
-
-[cols=",,,",options="header",]
-|===
-|Attribute |Type |Description |Default
-|requiresExtent |String |Whether an extent is required for this class
-|true
-
-|embeddedOnly |String |Whether objects of this class can only be stored
-embedded in other objects |false
-
-|detachable |String |Whether objects of this class can be detached
-|false
-
-|identityType |IdentityType |Type of identity (APPLICATION, DATASTORE,
-NONDURABLE) |DATASTORE
-
-|objectIdClass |Class |Object-id class |
-
-|table |String |ORM : Name of the table where this class is persisted |
-
-|catalog |String |ORM : Name of the catalog where this table is
-persisted |
-
-|schema |String |ORM : Name of the schema where this table is persisted
-|
-
-|cacheable |String |Whether the class can be L2 cached. *From JDO2.2*
-|*true* | false
-
-|serializeRead |String |Whether to default reads of this object type to
-lock the object |false
-
-|extensions |xref:Extension[Extension][] |Vendor extensions |
-|===
-
-....
-@PersistenceCapable(identityType=IdentityType.APPLICATION)
-public class MyClass
-{
- ...
-}
-....
-
-{empty} +
-
-{empty} +
-
-
-anchor:PersistenceAware[]
-
-=== @PersistenceAwareanchor:aPersistenceAware[]
-
-This annotation is used when you want to mark a class as being used in
-persistence but not being persistable. That is "persistence-aware" in
-JDO terminology. It has no attributes. Specified on the *class*.
-
-....
-@PersistenceAware
-public class MyClass
-{
- ...
-}
-....
-
-See the documentation for link:class_types.html[Class Types]
-
-{empty} +
-
-{empty} +
-
-
-anchor:Cacheable_Class[]
-
-=== @Cacheableanchor:aCacheable[]
-
-This annotation is a shortcut for
-@PersistenceCapable(cacheable=\{value}) specifying whether the class can
-be cached in a Level 2 cache. Specified on the *class*. The default
-
-[cols=",,,",options="header",]
-|===
-|Attribute |Type |Description |Default
-|value |String |Whether the class is cacheable |*true* | false
-|===
-
-....
-@Cacheable("false")
-public class MyClass
-{
- ...
-}
-....
-
-{empty} +
-
-{empty} +
-
-
-anchor:EmbeddedOnly[]
-
-=== @EmbeddedOnlyanchor:aEmbeddedOnly[]
-
-This annotation is a shortcut for
-@PersistenceCapable(embeddedOnly="true") meaning that the class can only
-be persisted embedded into another class. It has no attributes.
-Specified on the *class*.
-
-....
-@EmbeddedOnly
-public class MyClass
-{
- ...
-}
-....
-
-{empty} +
-
-{empty} +
-
-
-anchor:Inheritance[]
-
-=== @Inheritanceanchor:aInheritance[]
-
-Annotation used to define the inheritance for a class. Specified on the
-*class*.
-
-[cols=",,,",options="header",]
-|===
-|Attribute |Type |Description |Default
-|strategy |InheritanceStrategy |The inheritance strategy (NEW_TABLE,
-SUBCLASS_TABLE, SUPERCLASS_TABLE) |
-
-|customStrategy |String |Name of a custom inheritance strategy
-(depending on what your JDO implementation supports |
-|===
-
-....
-@PersistenceCapable
-@Inheritance(strategy=InheritanceStrategy.NEW_TABLE)
-public class MyClass
-{
- ...
-}
-....
-
-{empty} +
-
-{empty} +
-
-
-anchor:Discriminator[]
-
-=== @Discriminatoranchor:aDiscriminator[]
-
-Annotation used to define a discriminator to be stored with instances of
-this class and is used to determine the types of the objects being
-stored. Specified on the *class*.
-
-[cols=",,,",options="header",]
-|===
-|Attribute |Type |Description |Default
-|strategy |DiscriminatorStrategy |The discriminator strategy (VALUE_MAP,
-CLASS_NAME, NONE) |
-
-|value |String |Value to use for instances of this type when using
-strategy of VALUE_MAP |
-
-|column |String |ORM : Name of the column to use to store the
-discriminator |
-
-|indexed |String |ORM : Whether the discriminator column is to be
-indexed |
-
-|columns |xref:Column[Column][] |ORM : Column definitions used for
-storing the discriminator |
-|===
-
-....
-@PersistenceCapable
-@Inheritance(strategy=InheritanceStrategy.NEW_TABLE)
-@Discriminator(strategy=DiscriminatorStrategy.CLASS_NAME)
-public class MyClass
-{
- ...
-}
-....
-
-{empty} +
-
-{empty} +
-
-
-anchor:DatastoreIdentity[]
-
-=== @DatastoreIdentityanchor:aDatastoreIdentity[]
-
-Annotation used to define the identity when using datastore-identity for
-the class. Specified on the *class*.
-
-[cols=",,,",options="header",]
-|===
-|Attribute |Type |Description |Default
-|strategy |IdGeneratorStrategy |The inheritance strategy (NATIVE,
-SEQUENCE, IDENTITY, INCREMENT, UUIDSTRING, UUIDHEX) |
-
-|customStrategy |String |Name of a custom id generation strategy (e.g
-"max", "auid"). This overrides the value of "strategy" |
-
-|sequence |String |Name of the sequence to use (when using SEQUENCE
-strategy) - refer to @Sequence |
-
-|column |String |ORM : Name of the column for the datastore identity |
-
-|columns |xref:Column[Column][] |ORM : Column definition for the
-column(s) for the datastore identity |
-
-|extensions |xref:Extension[Extension][] |Vendor extensions |
-|===
-
-....
-@PersistenceCapable
-@DatastoreIdentity(strategy=IdGeneratorStrategy.INCREMENT)
-public class MyClass
-{
- ...
-}
-....
-
-{empty} +
-
-{empty} +
-
-
-anchor:Version[]
-
-=== @Versionanchor:aVersion[]
-
-Annotation used to define the versioning details for use with optimistic
-transactions. Specified on the *class*.
-
-[cols=",,,",options="header",]
-|===
-|Attribute |Type |Description |Default
-|strategy |VersionStrategy |The version strategy (NONE, STATE_IMAGE,
-DATE_TIME, VERSION_NUMBER) |
-
-|indexed |String |Whether the version column(s) is indexed |
-
-|column |String |ORM : Name of the column for the version |
-
-|columns |xref:Column[Column][] |ORM : Column definition for the
-column(s) for the version |
-
-|extensions |xref:Extension[Extension][] |Vendor extensions |
-|===
-
-....
-@PersistenceCapable
-@Version(strategy=VersionStrategy.VERSION_NUMBER)
-public class MyClass
-{
- ...
-}
-....
-
-See the documentation for link:transactions.html[transactions]
-
-{empty} +
-
-{empty} +
-
-
-anchor:PrimaryKey_Class[]
-
-=== @PrimaryKeyanchor:aPrimaryKey[]
-
-Annotation used to define the primary key constraint for a class. Maps
-across to the <primary-key> MetaData element. Specified on the *class*.
-
-[cols=",,,",options="header",]
-|===
-|Attribute |Type |Description |Default
-|name |String |ORM : Name of the primary key constraint |
-
-|column |String |ORM : Name of the column for this key |
-
-|columns |xref:Column[Column][] |ORM : Column definition for the
-column(s) of this key |
-|===
-
-....
-@PersistenceCapable
-@PrimaryKey(name="MYCLASS_PK")
-public class MyClass
-{
- ...
-}
-....
-
-{empty} +
-
-{empty} +
-
-
-anchor:FetchPlans[]
-
-=== @FetchPlansanchor:aFetchPlans[]
-
-Annotation used to define a set of fetch plans. Specified on the
-*class*. Used by named queries
-
-[cols=",,,",options="header",]
-|===
-|Attribute |Type |Description |Default
-|value |xref:FetchPlan[FetchPlan][] |Array of fetch plans - see
-@FetchPlan annotation |
-|===
-
-....
-@PersistenceCapable
-@FetchPlans({@FetchPlan(name="plan_3", maxFetchDepth=3, fetchGroups={"group1", "group4"}),
- @FetchPlan(name="plan_4", maxFetchDepth=2, fetchGroups={"group1", "group2"})})
-public class MyClass
-{
- ...
-}
-....
-
-See the documentation for link:fetchgroups.html[FetchGroups]
-
-{empty} +
-
-{empty} +
-
-
-anchor:FetchPlan[]
-
-=== @FetchPlananchor:aFetchPlan[]
-
-Annotation used to define a fetch plan Is equivalent to the <fetch-plan>
-metadata element. Specified on the *class*. Used by named queries
-
-[cols=",,,",options="header",]
-|===
-|Attribute |Type |Description |Default
-|name |String |Name of the FetchPlan |
-
-|maxFetchDepth |int |Maximum fetch depth |1
-
-|fetchSize |int |Size hint for fetching query result sets |0
-
-|fetchGroups |String[] |Names of the fetch groups included in this
-FetchPlan. |
-|===
-
-....
-@PersistenceCapable
-@FetchPlan(name="plan_3", maxFetchDepth=3, fetchGroups={"group1", "group4"})
-public class MyClass
-{
- ...
-}
-....
-
-See the documentation for link:fetchgroups.html[FetchGroups]
-
-{empty} +
-
-{empty} +
-
-
-anchor:FetchGroups[]
-
-=== @FetchGroupsanchor:aFetchGroups[]
-
-Annotation used to define a set of fetch groups for a class. Specified
-on the *class*.
-
-[cols=",,,",options="header",]
-|===
-|Attribute |Type |Description |Default
-|value |xref:FetchGroup[FetchGroup][] |Array of fetch groups - see
-@FetchGroup annotation |
-|===
-
-....
-@PersistenceCapable
-@FetchGroups({@FetchGroup(name="one_two", members={@Persistent(name="field1"), @Persistent(name="field2")}),
- @FetchGroup(name="three", members={@Persistent(name="field3")})})
-public class MyClass
-{
- @Persistent
- String field1;
-
- @Persistent
- String field2;
-
- @Persistent
- String field3;
- ...
-}
-....
-
-See the documentation for link:fetchgroups.html[FetchGroups]
-
-{empty} +
-
-{empty} +
-
-
-anchor:FetchGroup[]
-
-=== @FetchGroupanchor:aFetchGroup[]
-
-Annotation used to define a fetch group. Is equivalent to the
-<fetch-group> metadata element. Specified on the *class*.
-
-[cols=",,,",options="header",]
-|===
-|Attribute |Type |Description |Default
-|name |String |Name of the fetch group |
-
-|postLoad |String |Whether to call jdoPostLoad after loading this fetch
-group |
-
-|members |xref:Persistent[Persistent][] |Definitions of the
-fields/properties to include in this fetch group |
-|===
-
-....
-@PersistenceCapable
-@FetchGroup(name="one_two", members={@Persistent(name="field1"), @Persistent(name="field2")})
-public class MyClass
-{
- @Persistent
- String field1;
-
- @Persistent
- String field2;
- ...
-}
-....
-
-See the documentation for link:fetchgroups.html[FetchGroups]
-
-{empty} +
-
-{empty} +
-
-
-anchor:Sequence[]
-
-=== @Sequenceanchor:aSequence[]
-
-Annotation used to define a sequence generator. Is equivalent to the
-<sequence> metadata element. Specified on the *class*.
-
-[cols=",,,",options="header",]
-|===
-|Attribute |Type |Description |Default
-|name |String |Name of the sequence |
-
-|strategy |SequenceStrategy |Strategy for the sequence
-(NONTRANSACTIONAL, CONTIGUOUS, NONCONTIGUOUS) |
-
-|datastoreSequence |String |Name of a datastore sequence that this maps
-to |
-
-|factoryClass |Class |Factory class to use to generate the sequence |
-
-|initialValue |int |Initial value of the sequence |1
-
-|allocationSize |int |Allocation size of the sequence |50
-
-|extensions |xref:Extension[Extension][] |Vendor extensions |
-|===
-
-{empty} +
-
-{empty} +
-
-
-anchor:Queries[]
-
-=== @Queriesanchor:aQueries[]
-
-Annotation used to define a set of named queries for a class. Specified
-on the *class*.
-
-[cols=",,,",options="header",]
-|===
-|Attribute |Type |Description |Default
-|value |xref:Query[Query][] |Array of queries - see @Query annotation |
-|===
-
-....
-@PersistenceCapable
-@Queries({@Query(name="PeopleCalledSmith", language="JDOQL",
- value="SELECT FROM mydomain.Person WHERE surname == \"Smith\""),
- @Query(name="PeopleCalledJones", language="JDOQL",
- value="SELECT FROM mydomain.Person WHERE surname == \"Jones\"")})
-public class Person
-{
- @Persistent
- String surname;
-
- ...
-}
-....
-
-{empty} +
-
-{empty} +
-
-
-anchor:Query[]
-
-=== @Queryanchor:aQuery[]
-
-Annotation used to define a named query. Is equivalent to the <query>
-metadata element. Specified on the *class*.
-
-[cols=",,,",options="header",]
-|===
-|Attribute |Type |Description |Default
-|name |String |Name of the query |
-
-|value |String |The query string itself |
-
-|language |String |Language of the query (JDOQL, SQL, ...) |JDOQL
-
-|unmodifiable |String |Whether the query is not modifiable at runtime |
-
-|unique |String |Whether the query returns unique results (for SQL
-queries only) |
-
-|resultClass |Class |Result class to use (for SQL queries only) |
-
-|fetchPlan |String |Name of a named FetchPlan to use with this query |
-
-|extensions |xref:Extension[Extension][] |Vendor extensions |
-|===
-
-....
-@PersistenceCapable
-@Query(name="PeopleCalledSmith", language="JDOQL",
- value="SELECT FROM mydomain.Person WHERE surname == \"Smith\"")
-public class Person
-{
- @Persistent
- String surname;
-
- ...
-}
-....
-
-{empty} +
-
-{empty} +
-
-
-anchor:Indices[]
-
-=== @Indicesanchor:aIndices[]
-
-Annotation used to define a set of indices for a class. Specified on the
-*class*.
-
-[cols=",,,",options="header",]
-|===
-|Attribute |Type |Description |Default
-|value |xref:Index_Class[Index][] |Array of indices - see @Index
-annotation |
-|===
-
-....
-@PersistenceCapable
-@Indices({@Index(name="MYINDEX_1", members={"field1","field2"}), @Index(name="MYINDEX_2", members={"field3"})})
-public class Person
-{
- ...
-}
-....
-
-{empty} +
-
-{empty} +
-
-
-anchor:Index_Class[]
-
-=== @Indexanchor:aIndex[]
-
-Annotation used to define an index for the class as a whole typically
-being a composite index across multiple columns or fields/properties. Is
-equivalent to the <index> metadata element when specified under class.
-Specified on the *class*.
-
-[cols=",,,",options="header",]
-|===
-|Attribute |Type |Description |Default
-|name |String |ORM : Name of the index |
-
-|table |String |ORM : Name of the table for the index |
-
-|unique |String |ORM : Whether the index is unique |
-
-|members |String[] |ORM : Names of the fields/properties that make up
-this index |
-
-|columns |xref:Column[Column][] |ORM : Columns that make up this index
-|
-|===
-
-....
-@PersistenceCapable
-@Index(name="MY_COMPOSITE_IDX", members={"field1", "field2"})
-public class MyClass
-{
- @Persistent
- String field1;
-
- @Persistent
- String field2;
-
- ...
-}
-....
-
-{empty} +
-
-{empty} +
-
-
-anchor:Uniques[]
-
-=== @Uniquesanchor:aUniques[]
-
-Annotation used to define a set of unique constraints for a class.
-Specified on the *class*.
-
-[cols=",,,",options="header",]
-|===
-|Attribute |Type |Description |Default
-|value |xref:Unique_Class[Unique][] |Array of constraints - see @Unique
-annotation |
-|===
-
-....
-@PersistenceCapable
-@Uniques({@Unique(name="MYCONST_1", members={"field1","field2"}), @Unique(name="MYCONST_2", members={"field3"})})
-public class Person
-{
- ...
-}
-....
-
-{empty} +
-
-{empty} +
-
-
-anchor:Unique_Class[]
-
-=== @Uniqueanchor:aUnique[]
-
-Annotation used to define a unique constraints for the class as a whole
-typically being a composite constraint across multiple columns or
-fields/properties. Is equivalent to the <unique> metadata element when
-specified under class. Specified on the *class*.
-
-[cols=",,,",options="header",]
-|===
-|Attribute |Type |Description |Default
-|name |String |ORM : Name of the constraint |
-
-|table |String |ORM : Name of the table for the constraint |
-
-|deferred |String |ORM : Whether the constraint is deferred |
-
-|members |String[] |ORM : Names of the fields/properties that make up
-this constraint |
-
-|columns |xref:Column[Column][] |ORM : Columns that make up this
-constraint |
-|===
-
-....
-@PersistenceCapable
-@Unique(name="MY_COMPOSITE_IDX", members={"field1", "field2"})
-public class MyClass
-{
- @Persistent
- String field1;
-
- @Persistent
- String field2;
-
- ...
-}
-....
-
-{empty} +
-
-{empty} +
-
-
-anchor:ForeignKeys[]
-
-=== @ForeignKeysanchor:aForeignKeys[]
-
-Annotation used to define a set of foreign-key constraints for a class.
-Specified on the *class*.
-
-[cols=",,,",options="header",]
-|===
-|Attribute |Type |Description |Default
-|value |xref:ForeignKey_Class[ForeignKey][] |Array of FK constraints -
-see @ForeignKey annotation |
-|===
-
-{empty} +
-
-{empty} +
-
-
-anchor:ForeignKey_Class[]
-
-=== @ForeignKeyanchor:aForeignKey[]
-
-Annotation used to define a foreign-key constraint for the class.
-Specified on the *class*.
-
-[cols=",,,",options="header",]
-|===
-|Attribute |Type |Description |Default
-|name |String |ORM : Name of the constraint |
-
-|table |String |ORM : Name of the table that the FK is to |
-
-|deferred |String |ORM : Whether the constraint is deferred |
-
-|unique |String |ORM : Whether the constraint is unique |
-
-|deleteAction |ForeignKeyAction |ORM : Action to apply to the FK to be
-used on deleting |ForeignKeyAction.RESTRICT
-
-|updateAction |ForeignKeyAction |ORM : Action to apply to the FK to be
-used on updating |ForeignKeyAction.RESTRICT
-
-|members |String[] |ORM : Names of the fields/properties that compose
-this FK. |
-
-|columns |xref:Column[Column][] |ORM : Columns that compose this FK. |
-|===
-
-{empty} +
-
-{empty} +
-
-
-anchor:Joins[]
-
-=== @Joinsanchor:aJoins[]
-
-Annotation used to define a set of joins (to secondary tables) for a
-class. Specified on the *class*.
-
-[cols=",,,",options="header",]
-|===
-|Attribute |Type |Description |Default
-|value |xref:Join_Class[Join][] |Array of joins - see @Join annotation
-|
-|===
-
-....
-@PersistenceCapable
-@Joins({@Join(table="MY_OTHER_TABLE", column="MY_PK_COL"),
- @Join(table="MY_SECOND_TABLE", column="MY_PK_COL")})
-public class MyClass
-{
- @Persistent(table="MY_OTHER_TABLE")
- String myField;
-
- @Persistent(table="MY_SECOND_TABLE")
- String myField2;
- ...
-}
-....
-
-{empty} +
-
-{empty} +
-
-
-anchor:Join_Class[]
-
-=== @Joinanchor:aJoin[]
-
-Annotation used to specify a join for a secondary table. Specified on
-the *class*.
-
-[cols=",,,",options="header",]
-|===
-|Attribute |Type |Description |Default
-|table |String |ORM : Table name used when joining the PK of a FCO class
-table to a secondary table. |
-
-|column |String |ORM : Name of the column used to join to the PK of the
-primary table (when only one column used) |
-
-|outer |String |ORM : Whether to use an outer join when retrieving
-fields/properties stored in the secondary table |
-
-|columns |xref:Column[Column][] |ORM : Name of the colums used to join
-to the PK of the primary table (when multiple columns used) |
-
-|extensions |xref:Extension[Extension][] |Vendor extensions |
-|===
-
-....
-@PersistenceCapable(name="MYTABLE")
-@Join(table="MY_OTHER_TABLE", column="MY_PK_COL")
-public class MyClass
-{
- @Persistent(name="MY_OTHER_TABLE")
- String myField;
- ...
-}
-....
-
-{empty} +
-
-{empty} +
-
-
-anchor:Columns_Class[]
-
-=== @Columnsanchor:aColumns[]
-
-Annotation used to define the columns which have no associated field in
-the class. User should specify a minimum of @Column "name", "jdbcType",
-and "insertValue". Specified on the *class*.
-
-[cols=",,,",options="header",]
-|===
-|Attribute |Type |Description |Default
-|value |xref:Column[Column][] |Array of columns - see @Column
-annotation |
-|===
-
-....
-@PersistenceCapable
-@Columns(@Column(name="MY_OTHER_COL", jdbcType="VARCHAR", insertValue="N/A")
-public class MyClass
-{
- ...
-}
-....
-
-{empty} +
-
-{empty} +
-
-
-anchor:Persistent[]
-
-=== @Persistentanchor:aPersistent[]
-
-Annotation used to define the fields/properties to be persisted. Is
-equivalent to the <field> and <property> metadata elements. Specified on
-the *field/method*.
-
-[cols=",,,",options="header",]
-|===
-|Attribute |Type |Description |Default
-|persistenceModifier |PersistenceModifier |Whether the field is
-persistent (PERSISTENT, TRANSACTIONAL, NONE) |[depends on field type]
-
-|defaultFetchGroup |String |Whether the field is part of the DFG |
-
-|nullValue |NullValue |Required behaviour when inserting a null value
-for this field (NONE, EXCEPTION, DEFAULT). |NONE
-
-|embedded |String |Whether this field as a whole is embedded. Use
-@Embedded to specify details. |
-
-|embeddedElement |String |Whether the element stored in this
-collection/array field/property is embedded |
-
-|embeddedKey |String |Whether the key stored in this map field/property
-is embedded |
-
-|embeddedValue |String |Whether the value stored in this map
-field/property is embedded |
-
-|serialized |String |Whether this field/property as a whole is
-serialised |
-
-|serializedElement |String |Whether the element stored in this
-collection/array field/property is serialised |
-
-|serializedKey |String |Whether the key stored in this map
-field/property is serialised |
-
-|serializedValue |String |Whether the value stored in this map
-field/property is serialised |
-
-|dependent |String |Whether this field is dependent, deleting the
-related object when deleting this object |
-
-|dependentElement |String |Whether the element stored in this
-field/property is dependent |
-
-|dependentKey |String |Whether the key stored in this field/property is
-dependent |
-
-|dependentValue |String |Whether the value stored in this field/property
-is dependent |
-
-|primaryKey |String |Whether this field is (part of) the primary key
-|false
-
-|valueStrategy |IdGeneratorStrategy |Strategy to use when generating
-values for the field (NATIVE, SEQUENCE, IDENTITY, INCREMENT, UUIDSTRING,
-UUIDHEX) |
-
-|customValueStrategy |String |Name of a custom id generation strategy
-(e.g "max", "auid"). This overrides the value of "valueStrategy" |
-
-|sequence |String |Name of the sequence when using valueStrategy of
-SEQUENCE - refer to @Sequence |
-
-|types |Class[] |Type(s) of field (when using interfaces/reference
-types). |
-
-|mappedBy |String |Field in other class when the relation is
-bidirectional to signify the owner of the relation |
-
-|table |String |ORM : Name of the table where this field is persisted.
-If this field is a collection/map/array then the table refers to a join
-table, otherwise this refers to a secondary table. |
-
-|name |String |Name of the field when defining an embedded field. |
-
-|columns |xref:Column[Column][] |ORM : Column definition(s) for the
-columns into which this field is persisted. This is only typically used
-when specifying columns of a field of an embedded class. |
-
-|cacheable |String |Whether the field/property can be L2 cached. *From
-JDO2.2* |*true* | false
-
-|extensions |xref:Extension[Extension][] |Vendor extensions |
-
-|recursionDepth |int |Recursion depth for this field when fetching.
-*Only applicable when specified within @FetchGroup* |1
-
-|loadFetchGroup |String |Name of a fetch group to activate when a load
-of this field is initiated (due to it being currently unloaded). Not
-used for getObjectById, queries, extents etc. Better to use @FetchGroup
-and define your groups |
-|===
-
-....
-@PersistenceCapable
-public class MyClass
-{
- @Persistent(primaryKey="true")
- String myField;
- ...
-}
-....
-
-See the documentation for link:field_types.html[Field Types]
-
-{empty} +
-
-{empty} +
-
-
-anchor:Serialized[]
-
-=== @Serializedanchor:aSerialized[]
-
-This annotation is a shortcut for @Persistent(serialized="true") meaning
-that the field is stored serialized. It has no attributes. Specified on
-the *field/method*.
-
-....
-@PersistenceCapable
-public class MyClass
-{
- @Serialized
- Object myField;
- ...
-}
-....
-
-{empty} +
-
-{empty} +
-
-
-anchor:NotPersistent[]
-
-=== @NotPersistentanchor:aNotPersistent[]
-
-This annotation is a shortcut for
-@Persistent(persistenceModifier=PersistenceModifier.NONE) meaning that
-the field/property is not persisted. It has no attributes. Specified on
-the *field/method*.
-
-....
-@PersistenceCapable
-public class MyClass
-{
- @NotPersistent
- String myOtherField;
- ...
-}
-....
-
-See the documentation for link:field_types.html[Field Types]
-
-{empty} +
-
-{empty} +
-
-
-anchor:Transactional[]
-
-=== @Transactionalanchor:aTransactional[]
-
-This annotation is a shortcut for
-@Persistent(persistenceModifier=PersistenceModifier.TRANSACTIONAL)
-meaning that the field/property is not persisted yet managed. It has no
-attributes. Specified on the *field/method*.
-
-....
-@PersistenceCapable
-public class MyClass
-{
- @Transactional
- String myOtherField;
- ...
-}
-....
-
-See the documentation for link:field_types.html[Field Types]
-
-{empty} +
-
-{empty} +
-
-
-anchor:Cacheable[]
-
-=== @Cacheableanchor:aCacheable[]
-
-This annotation is a shortcut for @Persistent(cacheable=\{value})
-specifying whether the field/property can be cached in a Level 2 cache.
-Specified on the *field/property*. The default
-
-[cols=",,,",options="header",]
-|===
-|Attribute |Type |Description |Default
-|value |String |Whether the field/property is cacheable |*true* | false
-|===
-
-....
-public class MyClass
-{
- @Cacheable("false")
- Collection elements;
- ...
-}
-....
-
-{empty} +
-
-{empty} +
-
-
-anchor:PrimaryKey[]
-
-=== @PrimaryKeyanchor:aPrimaryKey[]
-
-This annotation is a shortcut for @Persistent(primaryKey="true") meaning
-that the field/property is part of the primary key for the class. No
-attributes are needed when specified like this. Specified on the
-*field/method*.
-
-....
-@PersistenceCapable
-public class MyClass
-{
- @PrimaryKey
- String myOtherField;
- ...
-}
-....
-
-{empty} +
-
-{empty} +
-
-
-anchor:Element[]
-
-=== @Elementanchor:aElement[]
-
-Annotation used to define the element for any collection/array to be
-persisted. Maps across to the <collection>, <array> and <element>
-MetaData elements. Specified on the *field/method*.
-
-[cols=",,,",options="header",]
-|===
-|Attribute |Type |Description |Default
-|types |Class[] |Type(s) of element |When using an array is not needed.
-When using a collection will be taken from the collection definition if
-using generics, otherwise must be specified.
-
-|embedded |String |Whether the element is embedded into a join table |
-
-|serialized |String |Whether the element is serialised into the join
-table |
-
-|dependent |String |Whether the element objects are dependent when
-deleting the owner collection/array |
-
-|mappedBy |String |Field in the element class that represents this
-object (when the relation is bidirectional) |
-
-|embeddedMapping |xref:Embedded[Embedded][] |Definition of any
-embedding of the (persistable) element. Only 1 "Embedded" should be
-provided |
-
-|table |String |ORM : Name of the table for this element |
-
-|column |String |ORM : Name of the column for this element |
-
-|foreignKey |String |ORM : Name of any foreign-key constraint to add |
-
-|generateForeignKey |String |ORM : Whether to generate a FK constraint
-for the element (when not specifying the name) |
-
-|deleteAction |ForeignKeyAction |ORM : Action to be applied to the
-foreign key for this element for action upon deletion |
-
-|updateAction |ForeignKeyAction |ORM : Action to be applied to the
-foreign key for this element for action upon update |
-
-|index |String |ORM : Name of any index constraint to add |
-
-|indexed |String |ORM : Whether this element column is indexed |
-
-|unique |String |ORM : Whether this element column is unique |
-
-|uniqueKey |String |ORM : Name of any unique key constraint to add |
-
-|columns |xref:Column[Column][] |ORM : Column definition for the
-column(s) of this element |
-
-|extensions |xref:Extension[Extension][] |Vendor extensions |
-|===
-
-....
-@PersistenceCapable
-public class MyClass
-{
- @Element(types=mydomain.MyElementClass.class, dependent="true")
- Collection myField;
- ...
-}
-....
-
-{empty} +
-
-{empty} +
-
-
-anchor:Order[]
-
-=== @Orderanchor:aOrder[]
-
-Annotation used to define the ordering of an order-based
-Collection/array to be persisted. Maps across to the <order> MetaData
-element. Specified on the *field/method*.
-
-[cols=",,,",options="header",]
-|===
-|Attribute |Type |Description |Default
-|mappedBy |String |ORM : Field in the element class that represents the
-ordering of the collection/array |
-
-|column |String |ORM : Name of the column for this order |
-
-|columns |xref:Column[Column][] |ORM : Column definition for the
-column(s) of this order |
-
-|extensions |xref:Extension[Extension][] |Vendor extensions |
-|===
-
-....
-@PersistenceCapable
-public class MyClass
-{
- @Element(types=mydomain.MyElementClass.class, dependent="true")
- @Order(column="ORDER_IDX")
- Collection myField;
- ...
-}
-....
-
-{empty} +
-
-{empty} +
-
-
-anchor:Key[]
-
-=== @Keyanchor:aKey[]
-
-Annotation used to define the key for any map to be persisted. Maps
-across to the <map> and <key> MetaData elements. Specified on the
-*field/method*.
-
-[cols=",,,",options="header",]
-|===
-|Attribute |Type |Description |Default
-|types |Class[] |Type(s) of key. |When using generics will be taken from
-the Map definition, otherwise must be specified
-
-|embedded |String |Whether the key is embedded into a join table |
-
-|serialized |String |Whether the key is serialised into the join table |
-
-|dependent |String |Whether the key objects are dependent when deleting
-the owner map |
-
-|mappedBy |String |Used to specify the field in the value class where
-the key is stored (optional). |
-
-|embeddedMapping |xref:Embedded[Embedded][] |Definition of any
-embedding of the (persistable) key. Only 1 "Embedded" should be provided
-|
-
-|table |String |ORM : Name of the table for this key |
-
-|column |String |ORM : Name of the column for this key |
-
-|foreignKey |String |ORM : Name of any foreign-key constraint to add |
-
-|generateForeignKey |String |ORM : Whether to generate a FK constraint
-for the key (when not specifying the name) |
-
-|deleteAction |ForeignKeyAction |ORM : Action to be applied to the
-foreign key for this key for action upon deletion |
-
-|updateAction |ForeignKeyAction |ORM : Action to be applied to the
-foreign key for this key for action upon update |
-
-|index |String |ORM : Name of any index constraint to add |
-
-|indexed |String |ORM : Whether this key column is indexed |
-
-|uniqueKey |String |ORM : Name of any unique key constraint to add |
-
-|unique |String |ORM : Whether this key column is unique |
-
-|columns |xref:Column[Column][] |ORM : Column definition for the
-column(s) of this key |
-
-|extensions |xref:Extension[Extension][] |Vendor extensions |
-|===
-
-....
-@PersistenceCapable
-public class MyClass
-{
- @Key(types=java.lang.String.class)
- Map myField;
- ...
-}
-....
-
-{empty} +
-
-{empty} +
-
-
-anchor:Value[]
-
-=== @Valueanchor:aValue[]
-
-Annotation used to define the value for any map to be persisted. Maps
-across to the <map> and <value> MetaData elements. Specified on the
-*field/method*.
-
-[cols=",,,",options="header",]
-|===
-|Attribute |Type |Description |Default
-|types |Class[] |Type(s) of value. |When using generics will be taken
-from the Map definition, otherwise must be specified
-
-|embedded |String |Whether the value is embedded into a join table |
-
-|serialized |String |Whether the value is serialised into the join table
-|
-
-|dependent |String |Whether the value objects are dependent when
-deleting the owner map |
-
-|mappedBy |String |Used to specify the field in the key class where the
-value is stored (optional). |
-
-|embeddedMapping |xref:Embedded[Embedded][] |Definition of any
-embedding of the (persistable) value. Only 1 "Embedded" should be
-provided |
-
-|table |String |ORM : Name of the table for this value |
-
-|column |String |ORM : Name of the column for this value |
-
-|foreignKey |String |ORM : Name of any foreign-key constraint to add |
-
-|deleteAction |ForeignKeyAction |ORM : Action to be applied to the
-foreign key for this value for action upon deletion |
-
-|generateForeignKey |String |ORM : Whether to generate a FK constraint
-for the value (when not specifying the name) |
-
-|updateAction |ForeignKeyAction |ORM : Action to be applied to the
-foreign key for this value for action upon update |
-
-|index |String |ORM : Name of any index constraint to add |
-
-|indexed |String |ORM : Whether this value column is indexed |
-
-|uniqueKey |String |ORM : Name of any unique key constraint to add |
-
-|unique |String |ORM : Whether this value column is unique |
-
-|columns |xref:Column[Column][] |ORM : Column definition for the
-column(s) of this value |
-
-|extensions |xref:Extension[Extension][] |Vendor extensions |
-|===
-
-....
-@PersistenceCapable
-public class MyClass
-{
- @Key(types=java.lang.String.class)
- @Value(types=mydomain.MyValueClass.class, dependent="true")
- Map myField;
- ...
-}
-....
-
-{empty} +
-
-{empty} +
-
-
-anchor:Join[]
-
-=== @Joinanchor:aJoin[]
-
-Annotation used to specify a join to a join table for a
-collection/array/map. Specified on the *field/method*.
-
-[cols=",,,",options="header",]
-|===
-|Attribute |Type |Description |Default
-|table |String |ORM : Name of the table |
-
-|column |String |ORM : Name of the column to join our PK to in the join
-table (when only one column used) |
-
-|primaryKey |String |ORM : Name of any primary key constraint to add for
-the join table |
-
-|generatePrimaryKey |String |ORM : Whether to generate a PK constraint
-on the join table (when not specifying the name) |
-
-|foreignKey |String |ORM : Name of any foreign-key constraint to add |
-
-|generateForeignKey |String |ORM : Whether to generate a FK constraint
-on the join table (when not specifying the name) |
-
-|index |String |ORM : Name of any index constraint to add |
-
-|indexed |String |ORM : Whether the join column(s) is indexed |
-
-|uniqueKey |String |ORM : Name of any unique constraint to add |
-
-|unique |String |ORM : Whether the join column(s) has a unique
-constraint |
-
-|columns |xref:Column[Column][] |ORM : Name of the columns to join our
-PK to in the join table (when multiple columns used) |
-
-|extensions |xref:Extension[Extension][] |Vendor extensions |
-|===
-
-....
-@PersistenceCapable
-public class MyClass
-{
- @Persistent
- @Element(types=mydomain.MyElement.class)
- @Join(table="MYCLASS_ELEMENTS", column="MYCLASS_ELEMENTS_PK")
- Collection myField;
- ...
-}
-....
-
-{empty} +
-
-{empty} +
-
-
-anchor:Embedded[]
-
-=== @Embeddedanchor:aEmbedded[]
-
-Annotation used to define that the field contents is embedded into the
-same table as this field Maps across to the <embedded> MetaData element.
-Specified on the *field/method*.
-
-[cols=",,,",options="header",]
-|===
-|Attribute |Type |Description |Default
-|ownerMember |String |ORM : The field/property in the embedded object
-that links back to the owning object (where it has a bidirectional
-relation) |
-
-|nullIndicatorColumn |String |ORM : The column in the embedded object
-used to judge if the embedded object is null. |
-
-|nullIndicatorValue |String |ORM : The value in the null column to
-interpret the object as being null. |
-
-|members |xref:Persistent[Persistent][] |ORM : Field/property
-definitions for this embedding. |
-|===
-
-....
-@PersistenceCapable
-public class MyClass
-{
- @Embedded(members={
- @Persistent(name="field1", columns=@Column(name="OTHER_FLD_1")),
- @Persistent(name="field2", columns=@Column(name="OTHER_FLD_2"))
- }
- MyOtherClass myField;
- ...
-}
-
-@PersistenceCapable
-@EmbeddedOnly
-public class MyOtherClass
-{
- @Persistent
- String field1;
-
- @Persistent
- String field2;
-}
-....
-
-{empty} +
-
-{empty} +
-
-
-anchor:Columns[]
-
-=== @Columnsanchor:aColumns[]
-
-Annotation used to define the columns into which a field is persisted.
-If the field is persisted into a single column then @Column should be
-used. Specified on the *field/method*.
-
-[cols=",,,",options="header",]
-|===
-|Attribute |Type |Description |Default
-|value |xref:Column[Column][] |Array of columns - see @Columns
-annotation |
-|===
-
-....
-@PersistenceCapable
-public class MyClass
-{
- @Persistent
- @Columns({@Column(name="RED"), @Column(name="GREEN"), @Column(name="BLUE"), @Column(name="ALPHA")})
- Color myField;
- ...
-}
-....
-
-{empty} +
-
-{empty} +
-
-
-anchor:Column[]
-
-=== @Columnanchor:aColumn[]
-
-Annotation used to define that the colum where a field is persisted. Is
-equivalent to the <column> metadata element when specified under field.
-Specified on the *field/method* (and within other annotations).
-
-[cols=",,,",options="header",]
-|===
-|Attribute |Type |Description |Default
-|name |String |ORM : Name of the column |
-
-|target |String |ORM : Column in the other class that this maps to |
-
-|targetMember |String |ORM : Field/Property in the other class that this
-maps to |
-
-|jdbcType |String |ORM : JDBC Type to use for persisting into this
-column |
-
-|sqlType |String |ORM : SQL Type to use for persisting into this column
-|
-
-|length |int |ORM : Max length of data to store in this column |
-
-|scale |int |ORM : Max number of floating points of data to store in
-this column |
-
-|allowsNull |String |ORM : Whether null is allowed to be persisted into
-this column |
-
-|defaultValue |String |ORM : Default value to persist into this column.
-If you want the default to be NULL, then put this as "#NULL" |
-
-|insertValue |String |ORM : Value to insert into this column when it is
-an "unmapped" column. If you want the inserted value to be NULL, then
-put this as "#NULL" |
-
-|position |int |Position of this column in the owning table (0 = first)
-|
-
-|extensions |xref:Extension[Extension][] |Vendor extensions |
-|===
-
-....
-@PersistenceCapable
-public class MyClass
-{
- @Persistent
- @Column(name="MYCOL", jdbcType="VARCHAR", length=40)
- String field1;
-
- ...
-}
-....
-
-{empty} +
-
-{empty} +
-
-
-anchor:Index[]
-
-=== @Indexanchor:aIndex[]
-
-Annotation used to define that this field is indexed. Is equivalent to
-the <index> metadata element when specified under field. Specified on
-the *field/method*.
-
-[cols=",,,",options="header",]
-|===
-|Attribute |Type |Description |Default
-|name |String |ORM : Name of the index |
-|unique |String |ORM : Whether the index is unique |
-|===
-
-....
-@PersistenceCapable
-public class MyClass
-{
- @Persistent
- @Index(name="MYFIELD1_IDX")
- String field1;
-
- @Persistent
- @Index(name="MYFIELD2_IDX", unique="true")
- String field2;
-
- ...
-}
-....
-
-{empty} +
-
-{empty} +
-
-
-anchor:Unique[]
-
-=== @Uniqueanchor:aUnique[]
-
-Annotation used to define that this field has a unique constraint. Is
-equivalent to the <unique> metadata element when specified under field.
-Specified on the *field/method*.
-
-[cols=",,,",options="header",]
-|===
-|Attribute |Type |Description |Default
-|name |String |ORM : Name of the constraint |
-|deferred |String |ORM : Whether the constraint is deferred |
-|===
-
-....
-@PersistenceCapable
-public class MyClass
-{
- @Persistent
- @Unique(name="MYFIELD1_IDX")
- String field1;
-
- ...
-}
-....
-
-{empty} +
-
-{empty} +
-
-
-anchor:ForeignKey[]
-
-=== @ForeignKeyanchor:aForeignKey[]
-
-Annotation used to define the foreign key for a relationship field. Is
-equivalent to the <foreign-key> metadata element when specified under
-field. Specified on the *field/method*.
-
-[cols=",,,",options="header",]
-|===
-|Attribute |Type |Description |Default
-|name |String |ORM : Name of the constraint |
-
-|deferred |String |ORM : Whether the constraint is deferred |
-
-|unique |String |ORM : Whether the constraint is unique |
-
-|deleteAction |ForeignKeyAction |ORM : Action to apply to the FK to be
-used on deleting |ForeignKeyAction.RESTRICT
-
-|updateAction |ForeignKeyAction |ORM : Action to apply to the FK to be
-used on updating |ForeignKeyAction.RESTRICT
-|===
-
-....
-@PersistenceCapable
-public class MyClass
-{
- @Persistent
- @ForeignKey(name="MYFIELD1_FK", deleteAction=ForeignKeyAction.RESTRICT)
- String field1;
-
- ...
-}
-....
-
-{empty} +
-
-{empty} +
-
-
-anchor:Extensions[]
-
-=== @Extensionsanchor:aExtensions[]
-
-Annotation used to define a set of extensions specific to the JDO2
-implementation being used. Specified on the *class* or *field*.
-
-[cols=",,,",options="header",]
-|===
-|Attribute |Type |Description |Default
-|value |xref:Extension[Extension][] |Array of extensions - see
-@Extension annotation |
-|===
-
-....
-@PersistenceCapable
-@Extensions({@Extension(vendorName="MyJDOImpl", key="firstExtension", value="myValue"),
- @Extension(vendorName="MyJDOImpl", key="secondExtension", value="myValue")})
-public class Person
-{
- ...
-}
-....
-
-{empty} +
-
-{empty} +
-
-
-anchor:Extension[]
-
-=== @Extensionanchor:aExtension[]
-
-Annotation used to define an extension specific to a particular JDO
-implementation. Is equivalent to the <extension> metadata element.
-Specified on the *class* or *field*.
-
-[cols=",,,",options="header",]
-|===
-|Attribute |Type |Description |Default
-|vendorName |String |Name of the JDO vendor |
-|key |String |Key for the extension |
-|value |String |Value of the extension |
-|===
-
-....
-@PersistenceCapable
-@Extension(vendorName="MyJDOImpl", key="RunFast", value="true")
-public class Person
-{
- ...
-}
-....
-
-{empty} +
-
-{empty} +
-
-
-'''''
-
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/docs/annotations.html b/docs/annotations.html
index 9394080..3112680 100644
--- a/docs/annotations.html
+++ b/docs/annotations.html
@@ -11,9 +11,9 @@
<meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
<meta name="description" content="Apache JDO - Java Data Objects"/>
- <title>JDO TEST</title>
+ <title>JDO : Annotations<a id="JDO_:_Annotations"></a></title>
- <link rel="icon" type="image/png" href="https://tzaeschke.github.io/test-jdo-asciidoc/images/JDO_32x32.png"/>
+ <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
<!--
Apache JDO Documentation Template
@@ -280,25 +280,17 @@ table.CodeRay td.code>pre{padding:0}
<div class="row-fluid">
<div class="col-sm-9">
<div class="page-title">
- <h1>JDO TEST</h1>
+ <h1>JDO : Annotations<a id="JDO_:_Annotations"></a></h1>
</div>
<div id="doc-content">
- <div id="index" class="imageblock" style="text-align: center">
-<div class="content">
-<img src="images/JDOx150.png" alt="JDOx150">
-</div>
-</div>
-<div class="imageblock" style="text-align: center">
-<div class="content">
-<img src="images/jdo_text.png" alt="jdo text">
-</div>
+ <div id="index" class="paragraph">
+<p><span class="image" style="float: left"><img src="images/JDOx150.png" alt="JDOx150"></span>
+<span class="image" style="float: left"><img src="images/jdo_text.png" alt="jdo text"></span></p>
</div>
+<hr>
<div class="sect1">
-<h2 id="_jdo_test">JDO TEST</h2>
+<h2 id="_jdo_annotations_a_id_jdo_annotations_a">JDO : Annotations<a id="JDO_:_Annotations"></a></h2>
<div class="sectionbody">
-<hr>
-<div class="sect2">
-<h3 id="_jdo_annotations_a_id_jdo_annotations_a">JDO : Annotations<a id="JDO_:_Annotations"></a></h3>
<div class="paragraph">
<p>One of the things that JDK 1.5 provides that can be of some use is
annotations, and JDO provides its own set. When selecting to use
@@ -618,8 +610,8 @@ extension</p></td>
<div class="paragraph">
<p><a id="PersistenceCapable"></a></p>
</div>
-<div class="sect3">
-<h4 id="__persistencecapable_a_id_apersistencecapable_a">@PersistenceCapable<a id="aPersistenceCapable"></a></h4>
+<div class="sect2">
+<h3 id="__persistencecapable_a_id_apersistencecapable_a">@PersistenceCapable<a id="aPersistenceCapable"></a></h3>
<div class="paragraph">
<p>This annotation is used when you want to mark a class as persistent. It
equates to the <class> MetaData element (though with only some of its
@@ -732,8 +724,8 @@ public class MyClass
<p><a id="PersistenceAware"></a></p>
</div>
</div>
-<div class="sect3">
-<h4 id="__persistenceaware_a_id_apersistenceaware_a">@PersistenceAware<a id="aPersistenceAware"></a></h4>
+<div class="sect2">
+<h3 id="__persistenceaware_a_id_apersistenceaware_a">@PersistenceAware<a id="aPersistenceAware"></a></h3>
<div class="paragraph">
<p>This annotation is used when you want to mark a class as being used in
persistence but not being persistable. That is "persistence-aware" in
@@ -749,7 +741,7 @@ public class MyClass
</div>
</div>
<div class="paragraph">
-<p>See the documentation for <a href="class_types.adoc">Class Types</a></p>
+<p>See the documentation for <a href="class_types.html">Class Types</a></p>
</div>
<div class="paragraph">
<p><br></p>
@@ -761,8 +753,8 @@ public class MyClass
<p><a id="Cacheable_Class"></a></p>
</div>
</div>
-<div class="sect3">
-<h4 id="__cacheable_a_id_acacheable_a">@Cacheable<a id="aCacheable"></a></h4>
+<div class="sect2">
+<h3 id="__cacheable_a_id_acacheable_a">@Cacheable<a id="aCacheable"></a></h3>
<div class="paragraph">
<p>This annotation is a shortcut for
@PersistenceCapable(cacheable={value}) specifying whether the class can
@@ -811,8 +803,8 @@ public class MyClass
<p><a id="EmbeddedOnly"></a></p>
</div>
</div>
-<div class="sect3">
-<h4 id="__embeddedonly_a_id_aembeddedonly_a">@EmbeddedOnly<a id="aEmbeddedOnly"></a></h4>
+<div class="sect2">
+<h3 id="__embeddedonly_a_id_aembeddedonly_a">@EmbeddedOnly<a id="aEmbeddedOnly"></a></h3>
<div class="paragraph">
<p>This annotation is a shortcut for
@PersistenceCapable(embeddedOnly="true") meaning that the class can only
@@ -838,8 +830,8 @@ public class MyClass
<p><a id="Inheritance"></a></p>
</div>
</div>
-<div class="sect3">
-<h4 id="__inheritance_a_id_ainheritance_a">@Inheritance<a id="aInheritance"></a></h4>
+<div class="sect2">
+<h3 id="__inheritance_a_id_ainheritance_a">@Inheritance<a id="aInheritance"></a></h3>
<div class="paragraph">
<p>Annotation used to define the inheritance for a class. Specified on the
<strong>class</strong>.</p>
@@ -896,8 +888,8 @@ public class MyClass
<p><a id="Discriminator"></a></p>
</div>
</div>
-<div class="sect3">
-<h4 id="__discriminator_a_id_adiscriminator_a">@Discriminator<a id="aDiscriminator"></a></h4>
+<div class="sect2">
+<h3 id="__discriminator_a_id_adiscriminator_a">@Discriminator<a id="aDiscriminator"></a></h3>
<div class="paragraph">
<p>Annotation used to define a discriminator to be stored with instances of
this class and is used to determine the types of the objects being
@@ -977,8 +969,8 @@ public class MyClass
<p><a id="DatastoreIdentity"></a></p>
</div>
</div>
-<div class="sect3">
-<h4 id="__datastoreidentity_a_id_adatastoreidentity_a">@DatastoreIdentity<a id="aDatastoreIdentity"></a></h4>
+<div class="sect2">
+<h3 id="__datastoreidentity_a_id_adatastoreidentity_a">@DatastoreIdentity<a id="aDatastoreIdentity"></a></h3>
<div class="paragraph">
<p>Annotation used to define the identity when using datastore-identity for
the class. Specified on the <strong>class</strong>.</p>
@@ -1061,8 +1053,8 @@ public class MyClass
<p><a id="Version"></a></p>
</div>
</div>
-<div class="sect3">
-<h4 id="__version_a_id_aversion_a">@Version<a id="aVersion"></a></h4>
+<div class="sect2">
+<h3 id="__version_a_id_aversion_a">@Version<a id="aVersion"></a></h3>
<div class="paragraph">
<p>Annotation used to define the versioning details for use with optimistic
transactions. Specified on the <strong>class</strong>.</p>
@@ -1128,7 +1120,7 @@ public class MyClass
</div>
</div>
<div class="paragraph">
-<p>See the documentation for <a href="transactions.adoc">transactions</a></p>
+<p>See the documentation for <a href="transactions.html">transactions</a></p>
</div>
<div class="paragraph">
<p><br></p>
@@ -1140,8 +1132,8 @@ public class MyClass
<p><a id="PrimaryKey_Class"></a></p>
</div>
</div>
-<div class="sect3">
-<h4 id="__primarykey_a_id_aprimarykey_a">@PrimaryKey<a id="aPrimaryKey"></a></h4>
+<div class="sect2">
+<h3 id="__primarykey_a_id_aprimarykey_a">@PrimaryKey<a id="aPrimaryKey"></a></h3>
<div class="paragraph">
<p>Annotation used to define the primary key constraint for a class. Maps
across to the <primary-key> MetaData element. Specified on the <strong>class</strong>.</p>
@@ -1203,8 +1195,8 @@ public class MyClass
<p><a id="FetchPlans"></a></p>
</div>
</div>
-<div class="sect3">
-<h4 id="__fetchplans_a_id_afetchplans_a">@FetchPlans<a id="aFetchPlans"></a></h4>
+<div class="sect2">
+<h3 id="__fetchplans_a_id_afetchplans_a">@FetchPlans<a id="aFetchPlans"></a></h3>
<div class="paragraph">
<p>Annotation used to define a set of fetch plans. Specified on the
<strong>class</strong>. Used by named queries</p>
@@ -1246,7 +1238,7 @@ public class MyClass
</div>
</div>
<div class="paragraph">
-<p>See the documentation for <a href="fetchgroups.adoc">FetchGroups</a></p>
+<p>See the documentation for <a href="fetchgroups.html">FetchGroups</a></p>
</div>
<div class="paragraph">
<p><br></p>
@@ -1258,8 +1250,8 @@ public class MyClass
<p><a id="FetchPlan"></a></p>
</div>
</div>
-<div class="sect3">
-<h4 id="__fetchplan_a_id_afetchplan_a">@FetchPlan<a id="aFetchPlan"></a></h4>
+<div class="sect2">
+<h3 id="__fetchplan_a_id_afetchplan_a">@FetchPlan<a id="aFetchPlan"></a></h3>
<div class="paragraph">
<p>Annotation used to define a fetch plan Is equivalent to the <fetch-plan>
metadata element. Specified on the <strong>class</strong>. Used by named queries</p>
@@ -1318,7 +1310,7 @@ public class MyClass
</div>
</div>
<div class="paragraph">
-<p>See the documentation for <a href="fetchgroups.adoc">FetchGroups</a></p>
+<p>See the documentation for <a href="fetchgroups.html">FetchGroups</a></p>
</div>
<div class="paragraph">
<p><br></p>
@@ -1330,8 +1322,8 @@ public class MyClass
<p><a id="FetchGroups"></a></p>
</div>
</div>
-<div class="sect3">
-<h4 id="__fetchgroups_a_id_afetchgroups_a">@FetchGroups<a id="aFetchGroups"></a></h4>
+<div class="sect2">
+<h3 id="__fetchgroups_a_id_afetchgroups_a">@FetchGroups<a id="aFetchGroups"></a></h3>
<div class="paragraph">
<p>Annotation used to define a set of fetch groups for a class. Specified
on the <strong>class</strong>.</p>
@@ -1381,7 +1373,7 @@ public class MyClass
</div>
</div>
<div class="paragraph">
-<p>See the documentation for <a href="fetchgroups.adoc">FetchGroups</a></p>
+<p>See the documentation for <a href="fetchgroups.html">FetchGroups</a></p>
</div>
<div class="paragraph">
<p><br></p>
@@ -1393,8 +1385,8 @@ public class MyClass
<p><a id="FetchGroup"></a></p>
</div>
</div>
-<div class="sect3">
-<h4 id="__fetchgroup_a_id_afetchgroup_a">@FetchGroup<a id="aFetchGroup"></a></h4>
+<div class="sect2">
+<h3 id="__fetchgroup_a_id_afetchgroup_a">@FetchGroup<a id="aFetchGroup"></a></h3>
<div class="paragraph">
<p>Annotation used to define a fetch group. Is equivalent to the
<fetch-group> metadata element. Specified on the <strong>class</strong>.</p>
@@ -1453,7 +1445,7 @@ public class MyClass
</div>
</div>
<div class="paragraph">
-<p>See the documentation for <a href="fetchgroups.adoc">FetchGroups</a></p>
+<p>See the documentation for <a href="fetchgroups.html">FetchGroups</a></p>
</div>
<div class="paragraph">
<p><br></p>
@@ -1465,8 +1457,8 @@ public class MyClass
<p><a id="Sequence"></a></p>
</div>
</div>
-<div class="sect3">
-<h4 id="__sequence_a_id_asequence_a">@Sequence<a id="aSequence"></a></h4>
+<div class="sect2">
+<h3 id="__sequence_a_id_asequence_a">@Sequence<a id="aSequence"></a></h3>
<div class="paragraph">
<p>Annotation used to define a sequence generator. Is equivalent to the
<sequence> metadata element. Specified on the <strong>class</strong>.</p>
@@ -1543,8 +1535,8 @@ to</p></td>
<p><a id="Queries"></a></p>
</div>
</div>
-<div class="sect3">
-<h4 id="__queries_a_id_aqueries_a">@Queries<a id="aQueries"></a></h4>
+<div class="sect2">
+<h3 id="__queries_a_id_aqueries_a">@Queries<a id="aQueries"></a></h3>
<div class="paragraph">
<p>Annotation used to define a set of named queries for a class. Specified
on the <strong>class</strong>.</p>
@@ -1599,8 +1591,8 @@ public class Person
<p><a id="Query"></a></p>
</div>
</div>
-<div class="sect3">
-<h4 id="__query_a_id_aquery_a">@Query<a id="aQuery"></a></h4>
+<div class="sect2">
+<h3 id="__query_a_id_aquery_a">@Query<a id="aQuery"></a></h3>
<div class="paragraph">
<p>Annotation used to define a named query. Is equivalent to the <query>
metadata element. Specified on the <strong>class</strong>.</p>
@@ -1696,8 +1688,8 @@ public class Person
<p><a id="Indices"></a></p>
</div>
</div>
-<div class="sect3">
-<h4 id="__indices_a_id_aindices_a">@Indices<a id="aIndices"></a></h4>
+<div class="sect2">
+<h3 id="__indices_a_id_aindices_a">@Indices<a id="aIndices"></a></h3>
<div class="paragraph">
<p>Annotation used to define a set of indices for a class. Specified on the
<strong>class</strong>.</p>
@@ -1747,8 +1739,8 @@ public class Person
<p><a id="Index_Class"></a></p>
</div>
</div>
-<div class="sect3">
-<h4 id="__index_a_id_aindex_a">@Index<a id="aIndex"></a></h4>
+<div class="sect2">
+<h3 id="__index_a_id_aindex_a">@Index<a id="aIndex"></a></h3>
<div class="paragraph">
<p>Annotation used to define an index for the class as a whole typically
being a composite index across multiple columns or fields/properties. Is
@@ -1830,8 +1822,8 @@ public class MyClass
<p><a id="Uniques"></a></p>
</div>
</div>
-<div class="sect3">
-<h4 id="__uniques_a_id_auniques_a">@Uniques<a id="aUniques"></a></h4>
+<div class="sect2">
+<h3 id="__uniques_a_id_auniques_a">@Uniques<a id="aUniques"></a></h3>
<div class="paragraph">
<p>Annotation used to define a set of unique constraints for a class.
Specified on the <strong>class</strong>.</p>
@@ -1881,8 +1873,8 @@ public class Person
<p><a id="Unique_Class"></a></p>
</div>
</div>
-<div class="sect3">
-<h4 id="__unique_a_id_aunique_a">@Unique<a id="aUnique"></a></h4>
+<div class="sect2">
+<h3 id="__unique_a_id_aunique_a">@Unique<a id="aUnique"></a></h3>
<div class="paragraph">
<p>Annotation used to define a unique constraints for the class as a whole
typically being a composite constraint across multiple columns or
@@ -1965,8 +1957,8 @@ public class MyClass
<p><a id="ForeignKeys"></a></p>
</div>
</div>
-<div class="sect3">
-<h4 id="__foreignkeys_a_id_aforeignkeys_a">@ForeignKeys<a id="aForeignKeys"></a></h4>
+<div class="sect2">
+<h3 id="__foreignkeys_a_id_aforeignkeys_a">@ForeignKeys<a id="aForeignKeys"></a></h3>
<div class="paragraph">
<p>Annotation used to define a set of foreign-key constraints for a class.
Specified on the <strong>class</strong>.</p>
@@ -2006,8 +1998,8 @@ see @ForeignKey annotation</p></td>
<p><a id="ForeignKey_Class"></a></p>
</div>
</div>
-<div class="sect3">
-<h4 id="__foreignkey_a_id_aforeignkey_a">@ForeignKey<a id="aForeignKey"></a></h4>
+<div class="sect2">
+<h3 id="__foreignkey_a_id_aforeignkey_a">@ForeignKey<a id="aForeignKey"></a></h3>
<div class="paragraph">
<p>Annotation used to define a foreign-key constraint for the class.
Specified on the <strong>class</strong>.</p>
@@ -2091,8 +2083,8 @@ this FK.</p></td>
<p><a id="Joins"></a></p>
</div>
</div>
-<div class="sect3">
-<h4 id="__joins_a_id_ajoins_a">@Joins<a id="aJoins"></a></h4>
+<div class="sect2">
+<h3 id="__joins_a_id_ajoins_a">@Joins<a id="aJoins"></a></h3>
<div class="paragraph">
<p>Annotation used to define a set of joins (to secondary tables) for a
class. Specified on the <strong>class</strong>.</p>
@@ -2147,8 +2139,8 @@ public class MyClass
<p><a id="Join_Class"></a></p>
</div>
</div>
-<div class="sect3">
-<h4 id="__join_a_id_ajoin_a">@Join<a id="aJoin"></a></h4>
+<div class="sect2">
+<h3 id="__join_a_id_ajoin_a">@Join<a id="aJoin"></a></h3>
<div class="paragraph">
<p>Annotation used to specify a join for a secondary table. Specified on
the <strong>class</strong>.</p>
@@ -2227,8 +2219,8 @@ public class MyClass
<p><a id="Columns_Class"></a></p>
</div>
</div>
-<div class="sect3">
-<h4 id="__columns_a_id_acolumns_a">@Columns<a id="aColumns"></a></h4>
+<div class="sect2">
+<h3 id="__columns_a_id_acolumns_a">@Columns<a id="aColumns"></a></h3>
<div class="paragraph">
<p>Annotation used to define the columns which have no associated field in
the class. User should specify a minimum of @Column "name", "jdbcType",
@@ -2279,8 +2271,8 @@ public class MyClass
<p><a id="Persistent"></a></p>
</div>
</div>
-<div class="sect3">
-<h4 id="__persistent_a_id_apersistent_a">@Persistent<a id="aPersistent"></a></h4>
+<div class="sect2">
+<h3 id="__persistent_a_id_apersistent_a">@Persistent<a id="aPersistent"></a></h3>
<div class="paragraph">
<p>Annotation used to define the fields/properties to be persisted. Is
equivalent to the <field> and <property> metadata elements. Specified on
@@ -2513,7 +2505,7 @@ public class MyClass
</div>
</div>
<div class="paragraph">
-<p>See the documentation for <a href="field_types.adoc">Field Types</a></p>
+<p>See the documentation for <a href="field_types.html">Field Types</a></p>
</div>
<div class="paragraph">
<p><br></p>
@@ -2525,8 +2517,8 @@ public class MyClass
<p><a id="Serialized"></a></p>
</div>
</div>
-<div class="sect3">
-<h4 id="__serialized_a_id_aserialized_a">@Serialized<a id="aSerialized"></a></h4>
+<div class="sect2">
+<h3 id="__serialized_a_id_aserialized_a">@Serialized<a id="aSerialized"></a></h3>
<div class="paragraph">
<p>This annotation is a shortcut for @Persistent(serialized="true") meaning
that the field is stored serialized. It has no attributes. Specified on
@@ -2553,8 +2545,8 @@ public class MyClass
<p><a id="NotPersistent"></a></p>
</div>
</div>
-<div class="sect3">
-<h4 id="__notpersistent_a_id_anotpersistent_a">@NotPersistent<a id="aNotPersistent"></a></h4>
+<div class="sect2">
+<h3 id="__notpersistent_a_id_anotpersistent_a">@NotPersistent<a id="aNotPersistent"></a></h3>
<div class="paragraph">
<p>This annotation is a shortcut for
@Persistent(persistenceModifier=PersistenceModifier.NONE) meaning that
@@ -2573,7 +2565,7 @@ public class MyClass
</div>
</div>
<div class="paragraph">
-<p>See the documentation for <a href="field_types.adoc">Field Types</a></p>
+<p>See the documentation for <a href="field_types.html">Field Types</a></p>
</div>
<div class="paragraph">
<p><br></p>
@@ -2585,8 +2577,8 @@ public class MyClass
<p><a id="Transactional"></a></p>
</div>
</div>
-<div class="sect3">
-<h4 id="__transactional_a_id_atransactional_a">@Transactional<a id="aTransactional"></a></h4>
+<div class="sect2">
+<h3 id="__transactional_a_id_atransactional_a">@Transactional<a id="aTransactional"></a></h3>
<div class="paragraph">
<p>This annotation is a shortcut for
@Persistent(persistenceModifier=PersistenceModifier.TRANSACTIONAL)
@@ -2605,7 +2597,7 @@ public class MyClass
</div>
</div>
<div class="paragraph">
-<p>See the documentation for <a href="field_types.adoc">Field Types</a></p>
+<p>See the documentation for <a href="field_types.html">Field Types</a></p>
</div>
<div class="paragraph">
<p><br></p>
@@ -2617,8 +2609,8 @@ public class MyClass
<p><a id="Cacheable"></a></p>
</div>
</div>
-<div class="sect3">
-<h4 id="__cacheable_a_id_acacheable_a_2">@Cacheable<a id="aCacheable"></a></h4>
+<div class="sect2">
+<h3 id="__cacheable_a_id_acacheable_a_2">@Cacheable<a id="aCacheable"></a></h3>
<div class="paragraph">
<p>This annotation is a shortcut for @Persistent(cacheable={value})
specifying whether the field/property can be cached in a Level 2 cache.
@@ -2668,8 +2660,8 @@ Specified on the <strong>field/property</strong>. The default</p>
<p><a id="PrimaryKey"></a></p>
</div>
</div>
-<div class="sect3">
-<h4 id="__primarykey_a_id_aprimarykey_a_2">@PrimaryKey<a id="aPrimaryKey"></a></h4>
+<div class="sect2">
+<h3 id="__primarykey_a_id_aprimarykey_a_2">@PrimaryKey<a id="aPrimaryKey"></a></h3>
<div class="paragraph">
<p>This annotation is a shortcut for @Persistent(primaryKey="true") meaning
that the field/property is part of the primary key for the class. No
@@ -2697,8 +2689,8 @@ public class MyClass
<p><a id="Element"></a></p>
</div>
</div>
-<div class="sect3">
-<h4 id="__element_a_id_aelement_a">@Element<a id="aElement"></a></h4>
+<div class="sect2">
+<h3 id="__element_a_id_aelement_a">@Element<a id="aElement"></a></h3>
<div class="paragraph">
<p>Annotation used to define the element for any collection/array to be
persisted. Maps across to the <collection>, <array> and <element>
@@ -2862,8 +2854,8 @@ public class MyClass
<p><a id="Order"></a></p>
</div>
</div>
-<div class="sect3">
-<h4 id="__order_a_id_aorder_a">@Order<a id="aOrder"></a></h4>
+<div class="sect2">
+<h3 id="__order_a_id_aorder_a">@Order<a id="aOrder"></a></h3>
<div class="paragraph">
<p>Annotation used to define the ordering of an order-based
Collection/array to be persisted. Maps across to the <order> MetaData
@@ -2935,8 +2927,8 @@ public class MyClass
<p><a id="Key"></a></p>
</div>
</div>
-<div class="sect3">
-<h4 id="__key_a_id_akey_a">@Key<a id="aKey"></a></h4>
+<div class="sect2">
+<h3 id="__key_a_id_akey_a">@Key<a id="aKey"></a></h3>
<div class="paragraph">
<p>Annotation used to define the key for any map to be persisted. Maps
across to the <map> and <key> MetaData elements. Specified on the
@@ -3097,8 +3089,8 @@ public class MyClass
<p><a id="Value"></a></p>
</div>
</div>
-<div class="sect3">
-<h4 id="__value_a_id_avalue_a">@Value<a id="aValue"></a></h4>
+<div class="sect2">
+<h3 id="__value_a_id_avalue_a">@Value<a id="aValue"></a></h3>
<div class="paragraph">
<p>Annotation used to define the value for any map to be persisted. Maps
across to the <map> and <value> MetaData elements. Specified on the
@@ -3261,8 +3253,8 @@ public class MyClass
<p><a id="Join"></a></p>
</div>
</div>
-<div class="sect3">
-<h4 id="__join_a_id_ajoin_a_2">@Join<a id="aJoin"></a></h4>
+<div class="sect2">
+<h3 id="__join_a_id_ajoin_a_2">@Join<a id="aJoin"></a></h3>
<div class="paragraph">
<p>Annotation used to specify a join to a join table for a
collection/array/map. Specified on the <strong>field/method</strong>.</p>
@@ -3386,8 +3378,8 @@ public class MyClass
<p><a id="Embedded"></a></p>
</div>
</div>
-<div class="sect3">
-<h4 id="__embedded_a_id_aembedded_a">@Embedded<a id="aEmbedded"></a></h4>
+<div class="sect2">
+<h3 id="__embedded_a_id_aembedded_a">@Embedded<a id="aEmbedded"></a></h3>
<div class="paragraph">
<p>Annotation used to define that the field contents is embedded into the
same table as this field Maps across to the <embedded> MetaData element.
@@ -3475,8 +3467,8 @@ public class MyOtherClass
<p><a id="Columns"></a></p>
</div>
</div>
-<div class="sect3">
-<h4 id="__columns_a_id_acolumns_a_2">@Columns<a id="aColumns"></a></h4>
+<div class="sect2">
+<h3 id="__columns_a_id_acolumns_a_2">@Columns<a id="aColumns"></a></h3>
<div class="paragraph">
<p>Annotation used to define the columns into which a field is persisted.
If the field is persisted into a single column then @Column should be
@@ -3529,8 +3521,8 @@ public class MyClass
<p><a id="Column"></a></p>
</div>
</div>
-<div class="sect3">
-<h4 id="__column_a_id_acolumn_a">@Column<a id="aColumn"></a></h4>
+<div class="sect2">
+<h3 id="__column_a_id_acolumn_a">@Column<a id="aColumn"></a></h3>
<div class="paragraph">
<p>Annotation used to define that the colum where a field is persisted. Is
equivalent to the <column> metadata element when specified under field.
@@ -3656,8 +3648,8 @@ public class MyClass
<p><a id="Index"></a></p>
</div>
</div>
-<div class="sect3">
-<h4 id="__index_a_id_aindex_a_2">@Index<a id="aIndex"></a></h4>
+<div class="sect2">
+<h3 id="__index_a_id_aindex_a_2">@Index<a id="aIndex"></a></h3>
<div class="paragraph">
<p>Annotation used to define that this field is indexed. Is equivalent to
the <index> metadata element when specified under field. Specified on
@@ -3720,8 +3712,8 @@ public class MyClass
<p><a id="Unique"></a></p>
</div>
</div>
-<div class="sect3">
-<h4 id="__unique_a_id_aunique_a_2">@Unique<a id="aUnique"></a></h4>
+<div class="sect2">
+<h3 id="__unique_a_id_aunique_a_2">@Unique<a id="aUnique"></a></h3>
<div class="paragraph">
<p>Annotation used to define that this field has a unique constraint. Is
equivalent to the <unique> metadata element when specified under field.
@@ -3780,8 +3772,8 @@ public class MyClass
<p><a id="ForeignKey"></a></p>
</div>
</div>
-<div class="sect3">
-<h4 id="__foreignkey_a_id_aforeignkey_a_2">@ForeignKey<a id="aForeignKey"></a></h4>
+<div class="sect2">
+<h3 id="__foreignkey_a_id_aforeignkey_a_2">@ForeignKey<a id="aForeignKey"></a></h3>
<div class="paragraph">
<p>Annotation used to define the foreign key for a relationship field. Is
equivalent to the <foreign-key> metadata element when specified under
@@ -3860,8 +3852,8 @@ public class MyClass
<p><a id="Extensions"></a></p>
</div>
</div>
-<div class="sect3">
-<h4 id="__extensions_a_id_aextensions_a">@Extensions<a id="aExtensions"></a></h4>
+<div class="sect2">
+<h3 id="__extensions_a_id_aextensions_a">@Extensions<a id="aExtensions"></a></h3>
<div class="paragraph">
<p>Annotation used to define a set of extensions specific to the JDO2
implementation being used. Specified on the <strong>class</strong> or <strong>field</strong>.</p>
@@ -3912,8 +3904,8 @@ public class Person
<p><a id="Extension"></a></p>
</div>
</div>
-<div class="sect3">
-<h4 id="__extension_a_id_aextension_a">@Extension<a id="aExtension"></a></h4>
+<div class="sect2">
+<h3 id="__extension_a_id_aextension_a">@Extension<a id="aExtension"></a></h3>
<div class="paragraph">
<p>Annotation used to define an extension specific to a particular JDO
implementation. Is equivalent to the <extension> metadata element.
@@ -3978,7 +3970,6 @@ public class Person
<hr>
</div>
</div>
-</div>
</div>
</div>
</div>
diff --git a/docs/attach_detach.adoc b/docs/attach_detach.adoc
deleted file mode 100644
index 04dc866..0000000
--- a/docs/attach_detach.adoc
+++ /dev/null
@@ -1,264 +0,0 @@
-[[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
-
-'''''
-
-:_basedir:
-:_imagesdir: images/
-:notoc:
-:titlepage:
-:grid: cols
-
-== JDO Attach/Detachanchor:JDO_AttachDetach[]
-
-JDO provides an interface to the persistence of objects. JDO 1.0 doesn't
-provide a way of taking an object that was just persisted and just work
-on it and update the persisted object later. The user has to copy the
-fields manually and copy them back to the persisted object later. JDO
-2.0 introduces a new way of handling this situation, by *detaching* an
-object from the persistence graph, allowing it to be worked on in the
-users application. It can then be *attached* to the persistence graph
-later. Please refer to link:state_transition.html[Object Lifecycle] for
-where this fits in. The first thing to do to use a class with this
-facility is to tag it as "detachable". This is done by adding the
-attribute
-
-....
-<class name="MyClass" detachable="true">
-....
-
-This acts as an instruction to the link:enhancement.html[enhancement
-process] to add methods necessary to utilise the attach/detach process.
-
-The following code fragment highlights how to use the attach/detach
-mechanism
-
-....
-Product working_product=null;
-Transaction tx=pm.currentTransaction();
-try
-{
- tx.begin();
-
- Product prod=new Product(name,description,price);
- pm.makePersistent(prod);
-
- // Detach the product for use
- working_product = (Product)pm.detachCopy(prod);
-
- tx.commit();
-}
-catch (Exception e)
-{
- // Handle the exception
-}
-finally
-{
- if (tx.isActive())
- {
- tx.rollback();
- }
-}
-
-// Work on the detached object in our application
-working_product.setPrice(new_price);
-
-...
-
-// Reattach the updated object
-tx = pm.currentTransaction();
-try
-{
- tx.begin();
-
- Product attached_product = pm.makePersistent(working_product);
-
- tx.commit();
-}
-catch (Exception e)
-{
- // Handle the exception
-}
-finally
-{
- if (tx.isActive())
- {
- tx.rollback();
- }
-}
-....
-
-So we now don't need to do any manual copying of object fields just
-using a simple call to detach the object, and then attach it again
-later. Here are a few things to note with _attach/detach_ :-
-
-* Calling _detachCopy_ on an object that is not detachable will return a
-*transient* instance that is a COPY of the original, so use the COPY
-thereafter.
-* Calling _detachCopy_ on an object that is detachable will return a
-*detached* instance that is a COPY of the original, so use this COPY
-thereafter
-* A _detached_ object retain the id of its datastore entity. Detached
-objects should be used where you want to update the objects and attach
-them later (updating the associated object in the datastore. If you want
-to create copies of the objects in the datastore with their own
-identities you should use _makeTransient_ instead of _detachCopy_.
-* Calling _detachCopy_ will detach all fields of that object that are in
-the current link:fetchgroups.html[Fetch Group] for that class for that
-_PersistenceManager_.
-* By default the fields of the object that will be detached are those in
-the _Default Fetch Group_.
-* You should choose your link:fetchgroups.html[Fetch Group] carefully,
-bearing in mind which object(s) you want to access whilst detached.
-Detaching a relation field will detach the related object as well.
-* If you don't detach a field of an object, you [.underline]#cannot#
-access the value for that field while the object is detached.
-* If you don't detach a field of an object, you [.underline]#can# update
-the value for that field while detached, and thereafter you can access
-the value for that field.
-* Calling _makePersistent_ will return an (attached) copy of the
-detached object. It will attach all fields that were originally
-detached, and will also attach any other fields that were modified
-whilst detached.
-
-anchor:detach_all_on_commit[]
-
-=== Detach All On Commitanchor:Detach_All_On_Commit[]
-
-JDO2 also provides a mechanism whereby all objects that were enlisted in
-a transaction are automatically detached when the transaction is
-committed. You can enable this in one of 3 ways. If you want to use this
-mode globally for all __PersistenceManager__s (PMs) from a
-_PersistenceManagerFactory_ (PMF) you could either set the PMF property
-"datanucleus.DetachAllOnCommit", or you could create your PMF and call
-the PMF method *setDetachAllOnCommit(true)*. If instead you wanted to
-use this mode only for a particular PM, or only for a particular
-transaction for a particular PM, then you can call the PM method
-*setDetachAllOnCommit(true)* before the commit of the transaction, and
-it will apply for all transaction commits thereafter, until turned off
-(*setDetachAllOnCommit(false)*. Here's an example
-
-....
-// Create a PMF
-...
-
-// Create an object
-MyObject my = new MyObject();
-
-PersistenceManager pm = pmf.getPersistenceManager();
-Transaction tx = pm.currentTransaction();
-try
-{
- tx.begin();
-
- // We want our object to be detached when it's been persisted
- pm.setDetachAllOnCommit(true);
-
- // Persist the object that we created earlier
- pm.makePersistent(my);
-
- tx.commit();
- // The object "my" is now in detached state and can be used further
-}
-finally
-{
- if (tx.isActive)
- {
- tx.rollback();
- }
-}
-....
-
-{empty} +
-
-
-anchor:copy_on_attach[]
-
-=== Copy On Attachanchor:Copy_On_Attach[]
-
-By default when you are attaching a detached object it will return an
-attached copy of the detached object. JDO2.1 provides a new feature that
-allows this attachment to just migrate the existing detached object into
-attached state.
-
-You enable this by setting the _PersistenceManagerFactory_ (PMF)
-property *datanucleus.CopyOnAttach* to false. Alternatively you can use
-the methods _PersistenceManagerFactory.setCopyOnAttach(boolean flag)_ or
-_PersistenceManager.setCopyOnAttach(boolean flag)_. If we return to the
-example at the start of this page, this now becomes
-
-....
-// Reattach the updated object
-pm.setCopyOnAttach(false);
-tx = pm.currentTransaction();
-try
-{
- tx.begin();
-
- // working product is currently in detached state
-
- pm.makePersistent(working_product);
- // working_product is now in persistent (attached) state
-
- tx.commit();
-}
-catch (Exception e)
-{
- // Handle the exception
-}
-finally
-{
- if (tx.isActive())
- {
- tx.rollback();
- }
-}
-....
-
-Please note that if you try to attach two detached objects representing
-the same underlying persistent object within the same transaction (i.e a
-persistent object with the same identity already exists in the level 1
-cache), then a JDOUserException will be thrown.
-
-{empty} +
-
-
-=== Serialization of Detachable classesanchor:Serialization_of_Detachable_classes[]
-
-During enhancement of Detachable classes, a field called
-_jdoDetachedState_ is added to the class definition. This field allows
-reading and changing tracking of detached objects while they are not
-managed by a PersistenceManager.
-
-When serialization occurs on a Detachable object, the _jdoDetachedState_
-field is written to the serialized object stream. On deserialize, this
-field is written back to the new deserialized instance. This process
-occurs transparently to the application. However, if deserialization
-occurs with an un-enhanced version of the class, the detached state is
-lost.
-
-Serialization and deserialization of Detachable classes and un-enhanced
-versions of the same class is only possible if the field
-_serialVersionUID_ is added. It's recommended during development of the
-class, to define the _serialVersionUID_ and make the class to implement
-the _java.io.Serializable_ interface, as the following example:
-
-....
-class MyClass implements java.io.Serializable
-{
- private static final long serialVersionUID = 2765740961462495537L; // any random value here
-
- //.... other fields
-}
-....
-
-{empty} +
-
-
-'''''
-
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/docs/attach_detach.html b/docs/attach_detach.html
index fd1539c..6a78ec7 100644
--- a/docs/attach_detach.html
+++ b/docs/attach_detach.html
@@ -11,9 +11,9 @@
<meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
<meta name="description" content="Apache JDO - Java Data Objects"/>
- <title>JDO TEST</title>
+ <title>JDO Attach/Detach<a id="JDO_AttachDetach"></a></title>
- <link rel="icon" type="image/png" href="https://tzaeschke.github.io/test-jdo-asciidoc/images/JDO_32x32.png"/>
+ <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
<!--
Apache JDO Documentation Template
@@ -280,25 +280,17 @@ table.CodeRay td.code>pre{padding:0}
<div class="row-fluid">
<div class="col-sm-9">
<div class="page-title">
- <h1>JDO TEST</h1>
+ <h1>JDO Attach/Detach<a id="JDO_AttachDetach"></a></h1>
</div>
<div id="doc-content">
- <div id="index" class="imageblock" style="text-align: center">
-<div class="content">
-<img src="images/JDOx150.png" alt="JDOx150">
-</div>
-</div>
-<div class="imageblock" style="text-align: center">
-<div class="content">
-<img src="images/jdo_text.png" alt="jdo text">
-</div>
+ <div id="index" class="paragraph">
+<p><span class="image" style="float: left"><img src="images/JDOx150.png" alt="JDOx150"></span>
+<span class="image" style="float: left"><img src="images/jdo_text.png" alt="jdo text"></span></p>
</div>
+<hr>
<div class="sect1">
-<h2 id="_jdo_test">JDO TEST</h2>
+<h2 id="_jdo_attach_detach_a_id_jdo_attachdetach_a">JDO Attach/Detach<a id="JDO_AttachDetach"></a></h2>
<div class="sectionbody">
-<hr>
-<div class="sect2">
-<h3 id="_jdo_attach_detach_a_id_jdo_attachdetach_a">JDO Attach/Detach<a id="JDO_AttachDetach"></a></h3>
<div class="paragraph">
<p>JDO provides an interface to the persistence of objects. JDO 1.0 doesn’t
provide a way of taking an object that was just persisted and just work
@@ -307,7 +299,7 @@ fields manually and copy them back to the persisted object later. JDO
2.0 introduces a new way of handling this situation, by <strong>detaching</strong> an
object from the persistence graph, allowing it to be worked on in the
users application. It can then be <strong>attached</strong> to the persistence graph
-later. Please refer to <a href="state_transition.adoc">Object Lifecycle</a> for
+later. Please refer to <a href="state_transition.html">Object Lifecycle</a> for
where this fits in. The first thing to do to use a class with this
facility is to tag it as "detachable". This is done by adding the
attribute</p>
@@ -318,7 +310,7 @@ attribute</p>
</div>
</div>
<div class="paragraph">
-<p>This acts as an instruction to the <a href="enhancement.adoc">enhancement
+<p>This acts as an instruction to the <a href="enhancement.html">enhancement
process</a> to add methods necessary to utilise the attach/detach process.</p>
</div>
<div class="paragraph">
@@ -407,7 +399,7 @@ identities you should use <em>makeTransient</em> instead of <em>detachCopy</em>.
</li>
<li>
<p>Calling <em>detachCopy</em> will detach all fields of that object that are in
-the current <a href="fetchgroups.adoc">Fetch Group</a> for that class for that
+the current <a href="fetchgroups.html">Fetch Group</a> for that class for that
<em>PersistenceManager</em>.</p>
</li>
<li>
@@ -415,7 +407,7 @@ the current <a href="fetchgroups.adoc">Fetch Group</a> for that class for that
the <em>Default Fetch Group</em>.</p>
</li>
<li>
-<p>You should choose your <a href="fetchgroups.adoc">Fetch Group</a> carefully,
+<p>You should choose your <a href="fetchgroups.html">Fetch Group</a> carefully,
bearing in mind which object(s) you want to access whilst detached.
Detaching a relation field will detach the related object as well.</p>
</li>
@@ -439,8 +431,8 @@ whilst detached.</p>
<div class="paragraph">
<p><a id="detach_all_on_commit"></a></p>
</div>
-<div class="sect3">
-<h4 id="_detach_all_on_commit_a_id_detach_all_on_commit_a">Detach All On Commit<a id="Detach_All_On_Commit"></a></h4>
+<div class="sect2">
+<h3 id="_detach_all_on_commit_a_id_detach_all_on_commit_a">Detach All On Commit<a id="Detach_All_On_Commit"></a></h3>
<div class="paragraph">
<p>JDO2 also provides a mechanism whereby all objects that were enlisted in
a transaction are automatically detached when the transaction is
@@ -494,8 +486,8 @@ finally
<p><a id="copy_on_attach"></a></p>
</div>
</div>
-<div class="sect3">
-<h4 id="_copy_on_attach_a_id_copy_on_attach_a">Copy On Attach<a id="Copy_On_Attach"></a></h4>
+<div class="sect2">
+<h3 id="_copy_on_attach_a_id_copy_on_attach_a">Copy On Attach<a id="Copy_On_Attach"></a></h3>
<div class="paragraph">
<p>By default when you are attaching a detached object it will return an
attached copy of the detached object. JDO2.1 provides a new feature that
@@ -548,8 +540,8 @@ cache), then a JDOUserException will be thrown.</p>
<p><br></p>
</div>
</div>
-<div class="sect3">
-<h4 id="_serialization_of_detachable_classes_a_id_serialization_of_detachable_classes_a">Serialization of Detachable classes<a id="Serialization_of_Detachable_classes"></a></h4>
+<div class="sect2">
+<h3 id="_serialization_of_detachable_classes_a_id_serialization_of_detachable_classes_a">Serialization of Detachable classes<a id="Serialization_of_Detachable_classes"></a></h3>
<div class="paragraph">
<p>During enhancement of Detachable classes, a field called
<em>jdoDetachedState</em> is added to the class definition. This field allows
@@ -591,7 +583,6 @@ the <em>java.io.Serializable</em> interface, as the following example:</p>
<hr>
</div>
</div>
-</div>
</div>
</div>
</div>
diff --git a/docs/class_types.adoc b/docs/class_types.adoc
deleted file mode 100644
index 3d1c228..0000000
--- a/docs/class_types.adoc
+++ /dev/null
@@ -1,82 +0,0 @@
-[[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
-
-'''''
-
-:_basedir:
-:_imagesdir: images/
-:notoc:
-:titlepage:
-:grid: cols
-
-== JDO Class Typesanchor:JDO_Class_Types[]
-
-JDO provides a means of transparent persistence of objects of user
-defined classes. With JDO there are actually 3 types of classes.
-
-* *Persistence Capable* classes are classes whose instances can be
-persisted to a datastore. JDO provide the mechanism for persisting these
-instances, and they are core to JDO. These classes need to be _enhanced_
-according to a JDO Meta-Data specification before use within a JDO
-environment.
-* *Persistence Aware* classes are classes that manipulate Persistence
-Capable instances through direct attribute manipulation. These classes
-are typically enhanced with very minimal JDO Meta-Data. The enhancement
-process performs very little changes to these classes.
-* *Normal* classes are classes that aren't themselves persistable, and
-have no knowledge of persistence either. These classes are totally
-unchanged in JDO, and require no JDO Meta-Data whatsoever.
-
-=== PersistenceCapableanchor:PersistenceCapable[]
-
-Classes are defined as *PersistenceCapable* either by XML MetaData, like
-this
-
-....
-<class name="MyClass">
- ...
-</class>
-....
-
-or, in JDO2.1, using Annotations. Like this
-
-....
-@PersistenceCapable
-public class MyClass
-{
- ...
-}
-....
-
-{empty} +
-
-
-=== PersistenceAwareanchor:PersistenceAware[]
-
-Classes are defined as *PersistenceAware* either by XML MetaData, like
-this
-
-....
-<class name="MyClass" persistence-modifier="persistence-aware"/>
-....
-
-or, in JDO2.1, using Annotations. Like this
-
-....
-@PersistenceAware
-public class MyClass
-{
- ...
-}
-....
-
-{empty} +
-
-
-'''''
-
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/docs/class_types.html b/docs/class_types.html
index 69fc7dd..ba5cb02 100644
--- a/docs/class_types.html
+++ b/docs/class_types.html
@@ -11,9 +11,9 @@
<meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
<meta name="description" content="Apache JDO - Java Data Objects"/>
- <title>JDO TEST</title>
+ <title>JDO Class Types<a id="JDO_Class_Types"></a></title>
- <link rel="icon" type="image/png" href="https://tzaeschke.github.io/test-jdo-asciidoc/images/JDO_32x32.png"/>
+ <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
<!--
Apache JDO Documentation Template
@@ -280,25 +280,17 @@ table.CodeRay td.code>pre{padding:0}
<div class="row-fluid">
<div class="col-sm-9">
<div class="page-title">
- <h1>JDO TEST</h1>
+ <h1>JDO Class Types<a id="JDO_Class_Types"></a></h1>
</div>
<div id="doc-content">
- <div id="index" class="imageblock" style="text-align: center">
-<div class="content">
-<img src="images/JDOx150.png" alt="JDOx150">
-</div>
-</div>
-<div class="imageblock" style="text-align: center">
-<div class="content">
-<img src="images/jdo_text.png" alt="jdo text">
-</div>
+ <div id="index" class="paragraph">
+<p><span class="image" style="float: left"><img src="images/JDOx150.png" alt="JDOx150"></span>
+<span class="image" style="float: left"><img src="images/jdo_text.png" alt="jdo text"></span></p>
</div>
+<hr>
<div class="sect1">
-<h2 id="_jdo_test">JDO TEST</h2>
+<h2 id="_jdo_class_types_a_id_jdo_class_types_a">JDO Class Types<a id="JDO_Class_Types"></a></h2>
<div class="sectionbody">
-<hr>
-<div class="sect2">
-<h3 id="_jdo_class_types_a_id_jdo_class_types_a">JDO Class Types<a id="JDO_Class_Types"></a></h3>
<div class="paragraph">
<p>JDO provides a means of transparent persistence of objects of user
defined classes. With JDO there are actually 3 types of classes.</p>
@@ -325,8 +317,8 @@ unchanged in JDO, and require no JDO Meta-Data whatsoever.</p>
</li>
</ul>
</div>
-<div class="sect3">
-<h4 id="_persistencecapable_a_id_persistencecapable_a">PersistenceCapable<a id="PersistenceCapable"></a></h4>
+<div class="sect2">
+<h3 id="_persistencecapable_a_id_persistencecapable_a">PersistenceCapable<a id="PersistenceCapable"></a></h3>
<div class="paragraph">
<p>Classes are defined as <strong>PersistenceCapable</strong> either by XML MetaData, like
this</p>
@@ -354,8 +346,8 @@ public class MyClass
<p><br></p>
</div>
</div>
-<div class="sect3">
-<h4 id="_persistenceaware_a_id_persistenceaware_a">PersistenceAware<a id="PersistenceAware"></a></h4>
+<div class="sect2">
+<h3 id="_persistenceaware_a_id_persistenceaware_a">PersistenceAware<a id="PersistenceAware"></a></h3>
<div class="paragraph">
<p>Classes are defined as <strong>PersistenceAware</strong> either by XML MetaData, like
this</p>
@@ -387,7 +379,6 @@ public class MyClass
<hr>
</div>
</div>
-</div>
</div>
</div>
</div>
diff --git a/docs/cvs-usage.adoc b/docs/cvs-usage.adoc
deleted file mode 100644
index 6d82849..0000000
--- a/docs/cvs-usage.adoc
+++ /dev/null
@@ -1,13 +0,0 @@
-[[index]]
-image::images/JDOx150.png[align="center"]
-image::images/jdo_text.png[align="center"]
-== JDO TEST
-
-'''''
-
-:_basedir:
-:_imagesdir: images/
-:notoc:
-:titlepage:
-:grid: cols
-
diff --git a/docs/cvs-usage.html b/docs/cvs-usage.html
index 28ce369..46cb08d 100644
--- a/docs/cvs-usage.html
+++ b/docs/cvs-usage.html
@@ -13,7 +13,7 @@
<title>JDO TEST</title>
- <link rel="icon" type="image/png" href="https://tzaeschke.github.io/test-jdo-asciidoc/images/JDO_32x32.png"/>
+ <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
<!--
Apache JDO Documentation Template
diff --git a/docs/dependencies.adoc b/docs/dependencies.adoc
deleted file mode 100644
index 186e137..0000000
--- a/docs/dependencies.adoc
+++ /dev/null
@@ -1,54 +0,0 @@
-[[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
-
-'''''
-
-:_basedir:
-:_imagesdir: images/
-:notoc:
-:titlepage:
-:grid: cols
-
-== The Apache JDO Projectanchor:The_Apache_JDO_Project[]
-
-Apache JDO is a sub-project of the Apache DB TLP. It includes two major
-areas:
-
-* JDO 1, Java Specification Request 12, API, Reference Implementation,
-and Technology Compatibility Kit.
-* JDO 2, Java Specification Request 243, API, and Technology
-Compatibility Kit. The Reference Implementation is being developed in
-parallel by http://www.jpox.org[JPOX].
-
-The common external dependencies of JDO include the tools used to build
-and test it:
-
-* Subversion
-* Maven
-* Ant
-* JUnit
-
-Other external dependencies of JDO are subproject-specific:
-
-* JDO 2.0 API
-** Java Transaction API
-* JDO 2.0 TCK
-** Java Transaction API
-** Jakarta Commons Logging
-** Log4j
-** Apache Derby
-** Spring Framework Core
-** JPOX
-*** ASM
-*** Source Forge c3p0
-*** Commons DBCP
-*** Commons Pool
-*** Commons Collections
-
-'''''
-
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/docs/dependencies.html b/docs/dependencies.html
index 21b689b..af71860 100644
--- a/docs/dependencies.html
+++ b/docs/dependencies.html
@@ -11,9 +11,9 @@
<meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
<meta name="description" content="Apache JDO - Java Data Objects"/>
- <title>JDO TEST</title>
+ <title>The Apache JDO Project<a id="The_Apache_JDO_Project"></a></title>
- <link rel="icon" type="image/png" href="https://tzaeschke.github.io/test-jdo-asciidoc/images/JDO_32x32.png"/>
+ <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
<!--
Apache JDO Documentation Template
@@ -280,25 +280,17 @@ table.CodeRay td.code>pre{padding:0}
<div class="row-fluid">
<div class="col-sm-9">
<div class="page-title">
- <h1>JDO TEST</h1>
+ <h1>The Apache JDO Project<a id="The_Apache_JDO_Project"></a></h1>
</div>
<div id="doc-content">
- <div id="index" class="imageblock" style="text-align: center">
-<div class="content">
-<img src="images/JDOx150.png" alt="JDOx150">
-</div>
-</div>
-<div class="imageblock" style="text-align: center">
-<div class="content">
-<img src="images/jdo_text.png" alt="jdo text">
-</div>
+ <div id="index" class="paragraph">
+<p><span class="image" style="float: left"><img src="images/JDOx150.png" alt="JDOx150"></span>
+<span class="image" style="float: left"><img src="images/jdo_text.png" alt="jdo text"></span></p>
</div>
+<hr>
<div class="sect1">
-<h2 id="_jdo_test">JDO TEST</h2>
+<h2 id="_the_apache_jdo_project_a_id_the_apache_jdo_project_a">The Apache JDO Project<a id="The_Apache_JDO_Project"></a></h2>
<div class="sectionbody">
-<hr>
-<div class="sect2">
-<h3 id="_the_apache_jdo_project_a_id_the_apache_jdo_project_a">The Apache JDO Project<a id="The_Apache_JDO_Project"></a></h3>
<div class="paragraph">
<p>Apache JDO is a sub-project of the Apache DB TLP. It includes two major
areas:</p>
@@ -403,7 +395,6 @@ and test it:</p>
</div>
<hr>
</div>
-</div>
</div>
</div>
</div>
diff --git a/docs/downloads.adoc b/docs/downloads.adoc
deleted file mode 100644
index 97b802d..0000000
--- a/docs/downloads.adoc
+++ /dev/null
@@ -1,61 +0,0 @@
-[[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
-
-'''''
-
-:_basedir:
-:_imagesdir: images/
-:notoc:
-:titlepage:
-:grid: cols
-
-== Latest Official Releaseanchor:Latest_Official_Release[]
-
-link:releases/release-3.1.cgi[JDO 3.1] image:images/dot_clear.png[image]
-March 20, 2015
-
-== Previous Official Releasesanchor:Previous_Official_Releases[]
-
-link:releases/release-3.1-rc1.cgi[JDO 3.1-rc1]
-image:images/dot_clear.png[image] September 22, 2013
-
-link:releases/release-3.0.1.cgi[JDO 3.0.1]
-image:images/dot_clear.png[image] November 13, 2011
-
-== About JDO Releasesanchor:About_JDO_Releases[]
-
-A release of JDO includes the JDO API and the Technology Compatibility
-Kit (TCK). The TCK is available only in source form. The API project is
-available as source and binary, and as raw jar files.
-
-* The api project contains source to build jdo-api.jar. The jar file is
-the only artifact needed for users who wish to compile their programs
-using the JDO API. It can be downloaded automatically by maven and
-placed into the local maven repository if you include the proper
-dependency in your maven project definition. Use groupId javax.jdo,
-artifactId jdo-api, version 3.0, and define your remote repository as
-http://www.ibiblio.org/maven. Alternatively, it can be downloaded
-manually and put into a location of your choice.
-* The tck project contains the JDO Technology Compatibility Kit. The
-source distribution is the only artifact needed to be downloaded by the
-user.
-
-All are available for download as source, but if you wish to run the TCK
-you need only download the TCK project. The dependencies will be
-automatically downloaded by maven as jar files.
-
-For information on running the TCK, see link:tck.html[TCK]. If
-downloading multiple source packages, extract them all into the same
-directory. This will preserve the source dependencies among the
-projects.
-
-See link:svn.html[Source Code Version Control] for information about
-downloading the latest source code for all of the JDO projects.
-
-'''''
-
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/docs/downloads.html b/docs/downloads.html
index ac635a3..16668b9 100644
--- a/docs/downloads.html
+++ b/docs/downloads.html
@@ -11,9 +11,9 @@
<meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
<meta name="description" content="Apache JDO - Java Data Objects"/>
- <title>JDO TEST</title>
+ <title>Latest Official Release<a id="Latest_Official_Release"></a></title>
- <link rel="icon" type="image/png" href="https://tzaeschke.github.io/test-jdo-asciidoc/images/JDO_32x32.png"/>
+ <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
<!--
Apache JDO Documentation Template
@@ -280,32 +280,26 @@ table.CodeRay td.code>pre{padding:0}
<div class="row-fluid">
<div class="col-sm-9">
<div class="page-title">
- <h1>JDO TEST</h1>
+ <h1>Latest Official Release<a id="Latest_Official_Release"></a></h1>
</div>
<div id="doc-content">
- <div id="index" class="imageblock" style="text-align: center">
-<div class="content">
-<img src="images/JDOx150.png" alt="JDOx150">
-</div>
-</div>
-<div class="imageblock" style="text-align: center">
-<div class="content">
-<img src="images/jdo_text.png" alt="jdo text">
-</div>
+ <div id="index" class="paragraph">
+<p><span class="image" style="float: left"><img src="images/JDOx150.png" alt="JDOx150"></span>
+<span class="image" style="float: left"><img src="images/jdo_text.png" alt="jdo text"></span></p>
</div>
+<hr>
<div class="sect1">
-<h2 id="_jdo_test">JDO TEST</h2>
+<h2 id="_latest_official_release_a_id_latest_official_release_a">Latest Official Release<a id="Latest_Official_Release"></a></h2>
<div class="sectionbody">
-<hr>
-<div class="sect2">
-<h3 id="_latest_official_release_a_id_latest_official_release_a">Latest Official Release<a id="Latest_Official_Release"></a></h3>
<div class="paragraph">
<p><a href="releases/release-3.1.cgi">JDO 3.1</a> <span class="image"><img src="images/dot_clear.png" alt="image"></span>
March 20, 2015</p>
</div>
</div>
-<div class="sect2">
-<h3 id="_previous_official_releases_a_id_previous_official_releases_a">Previous Official Releases<a id="Previous_Official_Releases"></a></h3>
+</div>
+<div class="sect1">
+<h2 id="_previous_official_releases_a_id_previous_official_releases_a">Previous Official Releases<a id="Previous_Official_Releases"></a></h2>
+<div class="sectionbody">
<div class="paragraph">
<p><a href="releases/release-3.1-rc1.cgi">JDO 3.1-rc1</a>
<span class="image"><img src="images/dot_clear.png" alt="image"></span> September 22, 2013</p>
@@ -315,8 +309,10 @@ March 20, 2015</p>
<span class="image"><img src="images/dot_clear.png" alt="image"></span> November 13, 2011</p>
</div>
</div>
-<div class="sect2">
-<h3 id="_about_jdo_releases_a_id_about_jdo_releases_a">About JDO Releases<a id="About_JDO_Releases"></a></h3>
+</div>
+<div class="sect1">
+<h2 id="_about_jdo_releases_a_id_about_jdo_releases_a">About JDO Releases<a id="About_JDO_Releases"></a></h2>
+<div class="sectionbody">
<div class="paragraph">
<p>A release of JDO includes the JDO API and the Technology Compatibility
Kit (TCK). The TCK is available only in source form. The API project is
@@ -347,13 +343,13 @@ you need only download the TCK project. The dependencies will be
automatically downloaded by maven as jar files.</p>
</div>
<div class="paragraph">
-<p>For information on running the TCK, see <a href="tck.adoc">TCK</a>. If
+<p>For information on running the TCK, see <a href="tck.html">TCK</a>. If
downloading multiple source packages, extract them all into the same
directory. This will preserve the source dependencies among the
projects.</p>
</div>
<div class="paragraph">
-<p>See <a href="svn.adoc">Source Code Version Control</a> for information about
+<p>See <a href="svn.html">Source Code Version Control</a> for information about
downloading the latest source code for all of the JDO projects.</p>
</div>
<hr>
@@ -362,7 +358,6 @@ downloading the latest source code for all of the JDO projects.</p>
</div>
<hr>
</div>
-</div>
</div>
</div>
</div>
diff --git a/docs/enhancement.adoc b/docs/enhancement.adoc
deleted file mode 100644
index 06f6da7..0000000
--- a/docs/enhancement.adoc
+++ /dev/null
@@ -1,569 +0,0 @@
-[[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
-
-'''''
-
-:_basedir:
-:_imagesdir: images/
-:notoc:
-:titlepage:
-:grid: cols
-
-== JDO Enhancementanchor:JDO_Enhancement[]
-
-JDO defines a byte-code enhancement process that provides for dirty
-detection of fields. Before a class is used at runtime it is compiled
-and then "enhanced" to implement the interface _PersistenceCapable_, and
-optionally also _Detachable_.
-
-We can demonstrate this by taking a sample class, and seeing it before
-and after enhancement. We start with the following class
-
-....
-package org.apache.jdo.test;
-
-public class A
-{
- long id;
- String name;
- B b;
-
- public A(String name)
- {
- this.name = name;
- }
-
- public void setId(long id)
- {
- this.id = id;
- }
-
- public void setB(B b)
- {
- this.b = b;
- }
-
- public String getName()
- {
- return name;
- }
-
- public B getB()
- {
- return b;
- }
-
- public long getId()
- {
- return id;
- }
-
- public String toString()
- {
- return "A : id=" + id + " [" + name + "] b=\"" + b + "\"";
- }
-}
-....
-
-and require it to be _PersistenceCapable_ and _Detachable_. The
-enhancement process needs to intercept all updates of the fields of the
-class (id, name, b) as well as add on the necessary
-_PersistenceCapable_, _Detachable_ methods. After "enhancement" it
-becomes
-
-....
-package org.apache.jdo.test;
-import java.util.BitSet;
-
-import javax.jdo.JDODetachedFieldAccessException;
-import javax.jdo.JDOFatalInternalException;
-import javax.jdo.PersistenceManager;
-import javax.jdo.identity.LongIdentity;
-import javax.jdo.spi.Detachable;
-import javax.jdo.spi.JDOImplHelper;
-import javax.jdo.spi.JDOPermission;
-import javax.jdo.spi.PersistenceCapable;
-import javax.jdo.spi.StateManager;
-
-public class A implements PersistenceCapable, Detachable
-{
- long id;
- String name;
- B b;
- protected transient StateManager jdoStateManager;
- protected transient byte jdoFlags;
- protected Object[] jdoDetachedState;
- private static final byte[] jdoFieldFlags;
- private static final Class jdoPersistenceCapableSuperclass;
- private static final Class[] jdoFieldTypes;
- private static final String[] jdoFieldNames = __jdoFieldNamesInit();
- private static final int jdoInheritedFieldCount;
-
- static
- {
- jdoFieldTypes = __jdoFieldTypesInit();
- jdoFieldFlags = __jdoFieldFlagsInit();
- jdoInheritedFieldCount = __jdoGetInheritedFieldCount();
- jdoPersistenceCapableSuperclass = __jdoPersistenceCapableSuperclassInit();
- JDOImplHelper.registerClass(___jdo$loadClass("org.apache.jdo.test.A"),
- jdoFieldNames, jdoFieldTypes,
- jdoFieldFlags,
- jdoPersistenceCapableSuperclass, new A());
- }
-
- public void setId(long id)
- {
- jdoSetid(this, id);
- }
-
- public void setB(B b)
- {
- jdoSetb(this, b);
- }
-
- public String getName()
- {
- return jdoGetname(this);
- }
-
- public B getB()
- {
- return jdoGetb(this);
- }
-
- public long getId()
- {
- return jdoGetid(this);
- }
-
- public String toString()
- {
- return new StringBuilder().append("A : id=").append(jdoGetid(this))
- .append(" [").append(jdoGetname(this))
- .append("] b=\"").append(jdoGetb(this))
- .append("\"").toString();
- }
-
- public void jdoCopyKeyFieldsFromObjectId(PersistenceCapable.ObjectIdFieldConsumer fc, Object oid)
- {
- if (fc == null)
- throw new IllegalArgumentException
- ("ObjectIdFieldConsumer is null");
- if (!(oid instanceof LongIdentity))
- throw new ClassCastException
- ("oid is not instanceof javax.jdo.identity.LongIdentity");
- LongIdentity o = (LongIdentity) oid;
- fc.storeLongField(1, o.getKey());
- }
-
- protected void jdoCopyKeyFieldsFromObjectId(Object oid)
- {
- if (!(oid instanceof LongIdentity))
- throw new ClassCastException
- ("key class is not javax.jdo.identity.LongIdentity or null");
- LongIdentity o = (LongIdentity) oid;
- id = o.getKey();
- }
-
- public final void jdoCopyKeyFieldsToObjectId(Object oid)
- {
- throw new JDOFatalInternalException
- ("It's illegal to call jdoCopyKeyFieldsToObjectId for a class with Single Field Identity.");
- }
-
- public final void jdoCopyKeyFieldsToObjectId
- (PersistenceCapable.ObjectIdFieldSupplier fs, Object oid) {
- throw new JDOFatalInternalException
- ("It's illegal to call jdoCopyKeyFieldsToObjectId for a class with Single Field Identity.");
- }
-
- public final Object jdoGetObjectId()
- {
- if (jdoStateManager != null)
- return jdoStateManager.getObjectId(this);
- if (this.jdoIsDetached() != true)
- return null;
- return jdoDetachedState[0];
- }
-
- public final Object jdoGetVersion()
- {
- if (jdoStateManager != null)
- return jdoStateManager.getVersion(this);
- if (this.jdoIsDetached() != true)
- return null;
- return jdoDetachedState[1];
- }
-
- protected final void jdoPreSerialize()
- {
- if (jdoStateManager != null)
- jdoStateManager.preSerialize(this);
- }
-
- public final PersistenceManager jdoGetPersistenceManager()
- {
- return (jdoStateManager != null
- ? jdoStateManager.getPersistenceManager(this) : null);
- }
-
- public final Object jdoGetTransactionalObjectId()
- {
- return (jdoStateManager != null
- ? jdoStateManager.getTransactionalObjectId(this) : null);
- }
-
- public final boolean jdoIsDeleted()
- {
- return (jdoStateManager != null ? jdoStateManager.isDeleted(this): false);
- }
-
- public final boolean jdoIsDirty()
- {
- if (jdoStateManager != null)
- return jdoStateManager.isDirty(this);
- if (this.jdoIsDetached() != true)
- return false;
- if (((BitSet) jdoDetachedState[3]).length() <= 0)
- return false;
- return true;
- }
-
- public final boolean jdoIsNew()
- {
- return jdoStateManager != null ? jdoStateManager.isNew(this) : false;
- }
-
- public final boolean jdoIsPersistent()
- {
- return (jdoStateManager != null ? jdoStateManager.isPersistent(this): false);
- }
-
- public final boolean jdoIsTransactional()
- {
- return (jdoStateManager != null ? jdoStateManager.isTransactional(this): false);
- }
-
- public final boolean jdoIsDetached()
- {
- if (jdoStateManager == null) {
- if (jdoDetachedState == null)
- return false;
- return true;
- }
- return false;
- }
-
- public final void jdoMakeDirty(String fieldName)
- {
- if (jdoStateManager != null)
- jdoStateManager.makeDirty(this, fieldName);
- }
-
- public final Object jdoNewObjectIdInstance()
- {
- return new LongIdentity(getClass(), id);
- }
-
- public final Object jdoNewObjectIdInstance(Object key)
- {
- if (key == null)
- throw new IllegalArgumentException("key is null");
- if (key instanceof String != true)
- return new LongIdentity(this.getClass(), (Long) key);
- return new LongIdentity(this.getClass(), (String) key);
- }
-
- public final void jdoProvideFields(int[] fieldId)
- {
- if (fieldId == null)
- throw new IllegalArgumentException("argment is null");
- int i = fieldId.length - 1;
- if (i >= 0)
- {
- do
- jdoProvideField(fieldId[i]);
- while (--i >= 0);
- }
- }
-
- public final void jdoReplaceFields(int[] fieldId)
- {
- if (fieldId == null)
- throw new IllegalArgumentException("argument is null");
- int i = fieldId.length;
- if (i > 0)
- {
- int i_0_ = 0;
- do
- jdoReplaceField(fieldId[i_0_]);
- while (++i_0_ < i);
- }
- }
-
- public final void jdoReplaceFlags()
- {
- if (jdoStateManager != null)
- {
- A a = this;
- a.jdoFlags = a.jdoStateManager.replacingFlags(this);
- }
- }
-
- public final synchronized void jdoReplaceStateManager(StateManager stateManager)
- {
- if (jdoStateManager != null)
- {
- A a = this;
- a.jdoStateManager = a.jdoStateManager.replacingStateManager(this, stateManager);
- }
- else
- {
- JDOImplHelper.checkAuthorizedStateManager(sm);
- jdoStateManager = stateManager;
- jdoFlags = (byte) 1;
- }
- }
-
- public final synchronized void jdoReplaceDetachedState()
- {
- if (jdoStateManager == null)
- throw new IllegalStateException("state manager is null");
- A a = this;
- a.jdoDetachedState = a.jdoStateManager.replacingDetachedState(this, jdoDetachedState);
- }
-
- public PersistenceCapable jdoNewInstance(StateManager sm)
- {
- A result = new A();
- A a = result;
- a.jdoFlags = (byte) 1;
- a.jdoStateManager = sm;
- return a;
- }
-
- public PersistenceCapable jdoNewInstance(StateManager sm, Object o)
- {
- A result = new A();
- A a = result;
- a.jdoFlags = (byte) 1;
- a.jdoStateManager = sm;
- result.jdoCopyKeyFieldsFromObjectId(o);
- return a;
- }
-
- public void jdoReplaceField(int fieldIndex)
- {
- if (jdoStateManager == null)
- throw new IllegalStateException("state manager is null");
- switch (fieldIndex)
- {
- case 0:
- {
- A a = this;
- a.b = (B) a.jdoStateManager.replacingObjectField(this, fieldIndex);
- break;
- }
- case 1:
- {
- A a = this;
- a.id = a.jdoStateManager.replacingLongField(this, fieldIndex);
- break;
- }
- case 2:
- {
- A a = this;
- a.name = a.jdoStateManager.replacingStringField(this, fieldIndex);
- break;
- }
- default:
- throw new IllegalArgumentException("out of field index :" + fieldIndex);
- }
- }
-
- public void jdoProvideField(int fieldIndex)
- {
- if (jdoStateManager == null)
- throw new IllegalStateException("state manager is null");
- switch (fieldIndex)
- {
- case 0:
- jdoStateManager.providedObjectField(this, fieldIndex, b);
- break;
- case 1:
- jdoStateManager.providedLongField(this, fieldIndex, id);
- break;
- case 2:
- jdoStateManager.providedStringField(this, fieldIndex, name);
- break;
- default:
- throw new IllegalArgumentException("out of field index :" + fieldIndex);
- }
- }
-
- protected final void jdoCopyField(A obj, int index)
- {
- switch (index)
- {
- case 0:
- b = obj.b;
- break;
- case 1:
- id = obj.id;
- break;
- case 2:
- name = obj.name;
- break;
- default:
- throw new IllegalArgumentException("out of field index :" + index);
- }
- }
-
- public void jdoCopyFields(Object obj, int[] fieldNumbers)
- {
- if (jdoStateManager == null)
- throw new IllegalStateException("state manager is null");
- if (fieldNumbers == null)
- throw new IllegalStateException("fieldNumbers is null");
- if (obj instanceof A != true)
- throw new IllegalArgumentException("object is not org.apache.jdo.test.A");
- A me = (A) obj;
- if (jdoStateManager != me.jdoStateManager)
- throw new IllegalArgumentException("state manager unmatch");
- int i = fieldNumbers.length - 1;
- if (i >= 0)
- {
- do
- jdoCopyField(me, fieldNumbers[i]);
- while (--i >= 0);
- }
- }
-
- private static final String[] __jdoFieldNamesInit()
- {
- return new String[] { "b", "id", "name" };
- }
-
- private static final Class[] __jdoFieldTypesInit()
- {
- return new Class[] { ___jdo$loadClass("org.apache.jdo.test.B"), Long.TYPE,
- ___jdo$loadClass("java.lang.String") };
- }
-
- private static final byte[] __jdoFieldFlagsInit()
- {
- return new byte[] { 10, 24, 21 };
- }
-
- protected static int __jdoGetInheritedFieldCount()
- {
- return 0;
- }
-
- protected static int jdoGetManagedFieldCount()
- {
- return 3;
- }
-
- private static Class __jdoPersistenceCapableSuperclassInit()
- {
- return null;
- }
-
- public static Class ___jdo$loadClass(String className)
- {
- try
- {
- return Class.forName(className);
- }
- catch (ClassNotFoundException e)
- {
- throw new NoClassDefFoundError(e.getMessage());
- }
- }
-
- private Object jdoSuperClone()
- throws CloneNotSupportedException
- {
- A o = (A) super.clone();
- o.jdoFlags = (byte) 0;
- o.jdoStateManager = null;
- return o;
- }
-
- public A()
- {
- /* empty */
- }
-
- static void jdoSetb(A objPC, B b_m)
- {
- if (objPC.jdoStateManager == null)
- objPC.b = b_m;
- else
- objPC.jdoStateManager.setObjectField(objPC, 0, objPC.b, b_m);
- if (objPC.jdoIsDetached() == true)
- ((BitSet) objPC.jdoDetachedState[3]).set(0);
- }
-
- static B jdoGetb(A objPC)
- {
- if (objPC.jdoStateManager != null
- && !objPC.jdoStateManager.isLoaded(objPC, 0))
- return (B) objPC.jdoStateManager.getObjectField(objPC, 0, objPC.b);
- if (objPC.jdoIsDetached() != false
- && ((BitSet) objPC.jdoDetachedState[2]).get(0) != true
- && ((BitSet) objPC.jdoDetachedState[3]).get(0) != true)
- throw new JDODetachedFieldAccessException
- ("You have just attempted to access field \"b\" yet this field was not detached when you detached the object. " +
- "Either dont access this field, or detach the field when detaching the object.");
- return objPC.b;
- }
-
- static void jdoSetid(A objPC, long id_n)
- {
- objPC.id = id_n;
- }
-
- static long jdoGetid(A objPC)
- {
- return objPC.id;
- }
-
- static void jdoSetname(A objPC, String name_c)
- {
- if (objPC.jdoFlags != 0 && objPC.jdoStateManager != null)
- objPC.jdoStateManager.setStringField(objPC, 2, objPC.name, name_c);
- else
- {
- objPC.name = name_c;
- if (objPC.jdoIsDetached() == true)
- ((BitSet) objPC.jdoDetachedState[3]).set(2);
- }
- }
-
- static String jdoGetname(A objPC)
- {
- if (objPC.jdoFlags > 0 && objPC.jdoStateManager != null && !objPC.jdoStateManager.isLoaded(objPC, 2))
- return objPC.jdoStateManager.getStringField(objPC, 2, objPC.name);
- if (objPC.jdoIsDetached() != false && ((BitSet) objPC.jdoDetachedState[2]).get(2) != true)
- throw new JDODetachedFieldAccessException
- ("You have just attempted to access field \"name\" yet this field was not detached when you detached the object." +
- "Either dont access this field, or detach the field when detaching the object.");
- return objPC.name;
- }
-
- public A(String name)
- {
- jdoSetname(this, name);
- }
-}
-....
-
-'''''
-
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/docs/enhancement.html b/docs/enhancement.html
index f8f5bc5..fe7381f 100644
--- a/docs/enhancement.html
+++ b/docs/enhancement.html
@@ -11,9 +11,9 @@
<meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
<meta name="description" content="Apache JDO - Java Data Objects"/>
- <title>JDO TEST</title>
+ <title>JDO Enhancement<a id="JDO_Enhancement"></a></title>
- <link rel="icon" type="image/png" href="https://tzaeschke.github.io/test-jdo-asciidoc/images/JDO_32x32.png"/>
+ <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
<!--
Apache JDO Documentation Template
@@ -280,25 +280,17 @@ table.CodeRay td.code>pre{padding:0}
<div class="row-fluid">
<div class="col-sm-9">
<div class="page-title">
- <h1>JDO TEST</h1>
+ <h1>JDO Enhancement<a id="JDO_Enhancement"></a></h1>
</div>
<div id="doc-content">
- <div id="index" class="imageblock" style="text-align: center">
-<div class="content">
-<img src="images/JDOx150.png" alt="JDOx150">
-</div>
-</div>
-<div class="imageblock" style="text-align: center">
-<div class="content">
-<img src="images/jdo_text.png" alt="jdo text">
-</div>
+ <div id="index" class="paragraph">
+<p><span class="image" style="float: left"><img src="images/JDOx150.png" alt="JDOx150"></span>
+<span class="image" style="float: left"><img src="images/jdo_text.png" alt="jdo text"></span></p>
</div>
+<hr>
<div class="sect1">
-<h2 id="_jdo_test">JDO TEST</h2>
+<h2 id="_jdo_enhancement_a_id_jdo_enhancement_a">JDO Enhancement<a id="JDO_Enhancement"></a></h2>
<div class="sectionbody">
-<hr>
-<div class="sect2">
-<h3 id="_jdo_enhancement_a_id_jdo_enhancement_a">JDO Enhancement<a id="JDO_Enhancement"></a></h3>
<div class="paragraph">
<p>JDO defines a byte-code enhancement process that provides for dirty
detection of fields. Before a class is used at runtime it is compiled
@@ -859,7 +851,6 @@ public class A implements PersistenceCapable, Detachable
</div>
<hr>
</div>
-</div>
</div>
</div>
</div>
diff --git a/docs/exceptions.adoc b/docs/exceptions.adoc
deleted file mode 100644
index b0afa88..0000000
--- a/docs/exceptions.adoc
+++ /dev/null
@@ -1,99 +0,0 @@
-[[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
-
-'''''
-
-:_basedir:
-:_imagesdir: images/
-:notoc:
-:titlepage:
-:grid: cols
-
-== JDO Exceptionsanchor:JDO_Exceptions[]
-
-All exceptions raised by a JDO implementation are runtime exceptions
-which means that you can choose to catch the exceptions or not. The
-reason for JDO using _unchecked_ exceptions is that JDO tries to provide
-transparent persistence, and so needs to present the same interface and
-exceptions whatever the state an object has.
-
-=== JDOExceptionanchor:JDOException[]
-
-This is the base class for all JDO exceptions. It is a subclass of
-RuntimeException, and need not be declared or caught.
-
-{empty} +
-
-
-=== Can Retry Exceptionsanchor:Can_Retry_Exceptions[]
-
-image:images/jdo_exception_canretry.jpg[JDO Can Retry Exceptions]
-
-[cols=",",options="header",]
-|===
-|Exception |Description
-|JDOCanRetryException |This is the base class for errors that can be
-retried.
-
-|JDOUserException |This is the base class for user errors that can be
-retried.
-
-|JDODataStoreException |This is the base class for datastore errors that
-can be retried. Any root SQLException that caused this will typically be
-nested within this exception.
-
-|JDOObjectNotFoundException |This exception is to notify the application
-that an object does not exist in the datastore. When this exception is
-thrown during a transaction, there has been no change in the status of
-the transaction in progress. If this exception is a nested exception
-thrown during commit, then the transaction is rolled back.
-
-|JDOUnsupportedOptionException |This exception is thrown by an
-implementation to indicate that it does not implement a JDO optional
-feature.
-|===
-
-{empty} +
-
-
-=== Fatal Exceptionsanchor:Fatal_Exceptions[]
-
-image:images/jdo_exception_fatal.jpg[JDO Fatal Exceptions]
-
-[cols=",",options="header",]
-|===
-|Exception |Description
-|JDOFatalException |This is the base class for errors that cannot be
-retried. This exception generally means that the transaction associated
-with the PersistenceManager has been rolled back, and the transaction
-should be abandoned.
-
-|JDOFatalUserException |This is the base class for user errors that
-cannot be retried.
-
-|JDOFatalInternalException |This is the base class for JDO
-implementation failures.
-
-|JDOFatalDataStoreException |This is the base class for fatal datastore
-errors. When this exception is thrown, the transaction has been rolled
-back. Any root SQLException that caused this will typically be nested
-within this exception.
-
-|JDOOptimisticVerificationException |This exception is the result of a
-user commit operation in an optimistic transaction where the
-verification of new, modified, or deleted instances fails the
-verification. The user will never see this exception except as a result
-of commit.
-
-|JDODetachedFieldAccessException |This exception is the result of a user
-accessing a field of a detached instance, where the field was not copied
-to the detached instance.
-|===
-
-'''''
-
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/docs/exceptions.html b/docs/exceptions.html
index 2dc0814..faed14a 100644
--- a/docs/exceptions.html
+++ b/docs/exceptions.html
@@ -11,9 +11,9 @@
<meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
<meta name="description" content="Apache JDO - Java Data Objects"/>
- <title>JDO TEST</title>
+ <title>JDO Exceptions<a id="JDO_Exceptions"></a></title>
- <link rel="icon" type="image/png" href="https://tzaeschke.github.io/test-jdo-asciidoc/images/JDO_32x32.png"/>
+ <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
<!--
Apache JDO Documentation Template
@@ -280,25 +280,17 @@ table.CodeRay td.code>pre{padding:0}
<div class="row-fluid">
<div class="col-sm-9">
<div class="page-title">
- <h1>JDO TEST</h1>
+ <h1>JDO Exceptions<a id="JDO_Exceptions"></a></h1>
</div>
<div id="doc-content">
- <div id="index" class="imageblock" style="text-align: center">
-<div class="content">
-<img src="images/JDOx150.png" alt="JDOx150">
-</div>
-</div>
-<div class="imageblock" style="text-align: center">
-<div class="content">
-<img src="images/jdo_text.png" alt="jdo text">
-</div>
+ <div id="index" class="paragraph">
+<p><span class="image" style="float: left"><img src="images/JDOx150.png" alt="JDOx150"></span>
+<span class="image" style="float: left"><img src="images/jdo_text.png" alt="jdo text"></span></p>
</div>
+<hr>
<div class="sect1">
-<h2 id="_jdo_test">JDO TEST</h2>
+<h2 id="_jdo_exceptions_a_id_jdo_exceptions_a">JDO Exceptions<a id="JDO_Exceptions"></a></h2>
<div class="sectionbody">
-<hr>
-<div class="sect2">
-<h3 id="_jdo_exceptions_a_id_jdo_exceptions_a">JDO Exceptions<a id="JDO_Exceptions"></a></h3>
<div class="paragraph">
<p>All exceptions raised by a JDO implementation are runtime exceptions
which means that you can choose to catch the exceptions or not. The
@@ -306,8 +298,8 @@ reason for JDO using <em>unchecked</em> exceptions is that JDO tries to provide
transparent persistence, and so needs to present the same interface and
exceptions whatever the state an object has.</p>
</div>
-<div class="sect3">
-<h4 id="_jdoexception_a_id_jdoexception_a">JDOException<a id="JDOException"></a></h4>
+<div class="sect2">
+<h3 id="_jdoexception_a_id_jdoexception_a">JDOException<a id="JDOException"></a></h3>
<div class="paragraph">
<p>This is the base class for all JDO exceptions. It is a subclass of
RuntimeException, and need not be declared or caught.</p>
@@ -316,8 +308,8 @@ RuntimeException, and need not be declared or caught.</p>
<p><br></p>
</div>
</div>
-<div class="sect3">
-<h4 id="_can_retry_exceptions_a_id_can_retry_exceptions_a">Can Retry Exceptions<a id="Can_Retry_Exceptions"></a></h4>
+<div class="sect2">
+<h3 id="_can_retry_exceptions_a_id_can_retry_exceptions_a">Can Retry Exceptions<a id="Can_Retry_Exceptions"></a></h3>
<div class="paragraph">
<p><span class="image"><img src="images/jdo_exception_canretry.jpg" alt="JDO Can Retry Exceptions"></span></p>
</div>
@@ -369,8 +361,8 @@ feature.</p></td>
<p><br></p>
</div>
</div>
-<div class="sect3">
-<h4 id="_fatal_exceptions_a_id_fatal_exceptions_a">Fatal Exceptions<a id="Fatal_Exceptions"></a></h4>
+<div class="sect2">
+<h3 id="_fatal_exceptions_a_id_fatal_exceptions_a">Fatal Exceptions<a id="Fatal_Exceptions"></a></h3>
<div class="paragraph">
<p><span class="image"><img src="images/jdo_exception_fatal.jpg" alt="JDO Fatal Exceptions"></span></p>
</div>
@@ -433,7 +425,6 @@ to the detached instance.</p></td>
<hr>
</div>
</div>
-</div>
</div>
</div>
</div>
diff --git a/docs/extents.adoc b/docs/extents.adoc
deleted file mode 100644
index 293ba4e..0000000
--- a/docs/extents.adoc
+++ /dev/null
@@ -1,38 +0,0 @@
-[[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
-
-'''''
-
-:_basedir:
-:_imagesdir: images/
-:notoc:
-:titlepage:
-:grid: cols
-
-== JDO Extentsanchor:JDO_Extents[]
-
-JDO implementations manage the persistence of objects into the
-datastore. An *Extent* is a collection of objects of a particular type
-of object that have been persisted. When you define the MetaData for a
-class you can define if the class requires an Extent. The default is
-true. You access the Extent as follows
-
-....
-Extent e = pm.getExtent(MyClass.class, true);
-
-....
-
-This example will return an Extent that contains all persisted instances
-of the class _MyClass_ and its subclasses (the second argument in the
-call). An Extent is useful where you want to restrict a Query to query
-over just that set of objects. It can also be used where you just want
-to retrieve all persisted objects of a type (as an alternative to using
-a Query).
-
-'''''
-
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/docs/extents.html b/docs/extents.html
index a458df3..ce3e27e 100644
--- a/docs/extents.html
+++ b/docs/extents.html
@@ -11,9 +11,9 @@
<meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
<meta name="description" content="Apache JDO - Java Data Objects"/>
- <title>JDO TEST</title>
+ <title>JDO Extents<a id="JDO_Extents"></a></title>
- <link rel="icon" type="image/png" href="https://tzaeschke.github.io/test-jdo-asciidoc/images/JDO_32x32.png"/>
+ <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
<!--
Apache JDO Documentation Template
@@ -280,25 +280,17 @@ table.CodeRay td.code>pre{padding:0}
<div class="row-fluid">
<div class="col-sm-9">
<div class="page-title">
- <h1>JDO TEST</h1>
+ <h1>JDO Extents<a id="JDO_Extents"></a></h1>
</div>
<div id="doc-content">
- <div id="index" class="imageblock" style="text-align: center">
-<div class="content">
-<img src="images/JDOx150.png" alt="JDOx150">
-</div>
-</div>
-<div class="imageblock" style="text-align: center">
-<div class="content">
-<img src="images/jdo_text.png" alt="jdo text">
-</div>
+ <div id="index" class="paragraph">
+<p><span class="image" style="float: left"><img src="images/JDOx150.png" alt="JDOx150"></span>
+<span class="image" style="float: left"><img src="images/jdo_text.png" alt="jdo text"></span></p>
</div>
+<hr>
<div class="sect1">
-<h2 id="_jdo_test">JDO TEST</h2>
+<h2 id="_jdo_extents_a_id_jdo_extents_a">JDO Extents<a id="JDO_Extents"></a></h2>
<div class="sectionbody">
-<hr>
-<div class="sect2">
-<h3 id="_jdo_extents_a_id_jdo_extents_a">JDO Extents<a id="JDO_Extents"></a></h3>
<div class="paragraph">
<p>JDO implementations manage the persistence of objects into the
datastore. An <strong>Extent</strong> is a collection of objects of a particular type
@@ -325,7 +317,6 @@ a Query).</p>
</div>
<hr>
</div>
-</div>
</div>
</div>
</div>
diff --git a/docs/faq.adoc b/docs/faq.adoc
deleted file mode 100644
index 03c1d2b..0000000
--- a/docs/faq.adoc
+++ /dev/null
@@ -1,42 +0,0 @@
-[[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
-
-'''''
-
-:_basedir:
-:_imagesdir: images/
-:notoc:
-:titlepage:
-:grid: cols
-
-== Generalanchor:General[]
-
-*What is JDO?* JDO is Java Data Objects, a datastore-agnostic interface
-for storing Java objects in transactional datastores.
-
-*I'd like to find out more about the project and possibly contribute.
-What do I do next?* Participation on the project is via the mailing list
-and the source code repository. You join by subscribing to the mailing
-list and participating in discussions. You can help by contributing your
-ideas, enthusiasm, code, documentation, and tests. The fundamental tenet
-of the Apache Software Foundation is that great communities build great
-code. The emphasis is on community; the code comes from that. If you
-want to help, just join the mailing list, see what needs to be done, and
-do it. Welcome!
-
-*Where is the mailing list, and how can I subscribe?* The developers
-mailing list is jdo-dev@db.apache.org, a high-volume list currently
-receiving from 100 to 300 messages a month. +
-The users mailing list is jdo-user@db.apache.org.
-
-*Does this project use a wiki?* It does - the
-http://wiki.apache.org/jdo[JDO wiki] complements the work taking place
-on the mailing list and provides additional information on the project.
-
-'''''
-
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/docs/faq.html b/docs/faq.html
index 311087c..f3b4327 100644
--- a/docs/faq.html
+++ b/docs/faq.html
@@ -11,9 +11,9 @@
<meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
<meta name="description" content="Apache JDO - Java Data Objects"/>
- <title>JDO TEST</title>
+ <title>General<a id="General"></a></title>
- <link rel="icon" type="image/png" href="https://tzaeschke.github.io/test-jdo-asciidoc/images/JDO_32x32.png"/>
+ <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
<!--
Apache JDO Documentation Template
@@ -280,25 +280,17 @@ table.CodeRay td.code>pre{padding:0}
<div class="row-fluid">
<div class="col-sm-9">
<div class="page-title">
- <h1>JDO TEST</h1>
+ <h1>General<a id="General"></a></h1>
</div>
<div id="doc-content">
- <div id="index" class="imageblock" style="text-align: center">
-<div class="content">
-<img src="images/JDOx150.png" alt="JDOx150">
-</div>
-</div>
-<div class="imageblock" style="text-align: center">
-<div class="content">
-<img src="images/jdo_text.png" alt="jdo text">
-</div>
+ <div id="index" class="paragraph">
+<p><span class="image" style="float: left"><img src="images/JDOx150.png" alt="JDOx150"></span>
+<span class="image" style="float: left"><img src="images/jdo_text.png" alt="jdo text"></span></p>
</div>
+<hr>
<div class="sect1">
-<h2 id="_jdo_test">JDO TEST</h2>
+<h2 id="_general_a_id_general_a">General<a id="General"></a></h2>
<div class="sectionbody">
-<hr>
-<div class="sect2">
-<h3 id="_general_a_id_general_a">General<a id="General"></a></h3>
<div class="paragraph">
<p><strong>What is JDO?</strong> JDO is Java Data Objects, a datastore-agnostic interface
for storing Java objects in transactional datastores.</p>
@@ -331,7 +323,6 @@ on the mailing list and provides additional information on the project.</p>
</div>
<hr>
</div>
-</div>
</div>
</div>
</div>
diff --git a/docs/fetchgroups.adoc b/docs/fetchgroups.adoc
deleted file mode 100644
index c958e45..0000000
--- a/docs/fetchgroups.adoc
+++ /dev/null
@@ -1,309 +0,0 @@
-[[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
-
-'''''
-
-:_basedir:
-:_imagesdir: images/
-:notoc:
-:titlepage:
-:grid: cols
-
-== Fetch Groupsanchor:Fetch_Groups[]
-
-When an object is retrieved from the datastore by JDO typically not all
-fields are retrieved immediately. This is because for efficiency
-purposes only particular field types are retrieved in the initial access
-of the object, and then any other objects are retrieved when accessed
-(lazy loading). The group of fields that are loaded is called a *fetch
-group*. There are 3 types of "fetch groups" to consider
-
-* xref:dfg[Default Fetch Group] : defined in all JDO specs, containing
-the fields of a class that will be retrieved by default (with no user
-specification).
-* xref:static[Named Fetch Groups] : defined by the JDO2 specification,
-and defined in MetaData (XML/annotations) with the fields of a class
-that are part of that fetch group. The definition here is _static_
-* xref:dynamic[Dynamic Fetch Groups] : Programmatic definition of fetch
-groups at runtime via an API
-
-The *fetch group* in use for a class is controled via the _FetchPlan_
-http://db.apache.org/jdo/api20/apidocs/javax/jdo/FetchPlan.html[image:images/javadoc.png[image]]
-interface. To get a handle on the current _FetchPlan_ we do
-
-....
-FetchPlan fp = pm.getFetchPlan();
-....
-
-{empty} +
-
-anchor:dfg[]
-
-=== Default Fetch Groupanchor:Default_Fetch_Group[]
-
-JDO provides an initial fetch group, comprising the fields that will be
-retrieved when an object is retrieved if the user does nothing to define
-the required behaviour. By default the _default fetch group_ comprises
-all fields of the following types :-
-
-* primitives : boolean, byte, char, double, float, int, long, short
-* Object wrappers of primitives : Boolean, Byte, Character, Double,
-Float, Integer, Long, Short
-* java.lang.String, java.lang.Number, java.lang.Enum
-* java.math.BigDecimal, java.math.BigInteger
-* java.util.Date
-
-If you wish to change the *Default Fetch Group* for a class you can
-update the Meta-Data for the class as follows (for XML)
-
-....
-<class name="MyClass">
- ...
- <field name="fieldX" default-fetch-group="true"/>
-</class>
-....
-
-or using annotations
-
-....
-@Persistent(defaultFetchGroup="true")
-SomeType fieldX;
-....
-
-When a _PersistenceManager_ is created it starts with a FetchPlan of the
-"default" fetch group. That is, if we call
-
-....
-Collection fetchGroups = fp.getGroups();
-....
-
-this will have one group, called "default". At runtime, if you have been
-using other fetch groups and want to revert back to the default fetch
-group at any time you simply do
-
-....
-fp.setGroup(FetchPlan.DEFAULT);
-....
-
-{empty} +
-
-
-anchor:static[]
-
-=== Named Fetch Groupsanchor:Named_Fetch_Groups[]
-
-As mentioned above, JDO allows specification of users own fetch groups.
-These are specified in the MetaData of the class. For example, if we
-have the following class
-
-....
-class MyClass
-{
- String name;
- HashSet coll;
- MyOtherClass other;
-}
-....
-
-and we want to have the [.underline]#other# field loaded whenever we
-load objects of this class, we define our MetaData as
-
-....
-<package name="mydomain">
- <class name="MyClass">
- <field name="name">
- <column length="100" jdbc-type="VARCHAR"/>
- </field>
- <field name="coll" persistence-modifier="persistent">
- <collection element-type="mydomain.Address"/>
- <join/>
- </field>
- <field name="other" persistence-modifier="persistent"/>
- <fetch-group name="otherfield">
- <field name="other"/>
- </fetch-group>
- </class>
-</package>
-....
-
-or using annotations
-
-....
-@PersistenceCapable
-@FetchGroup(name="otherfield", members={@Persistent(name="other")})
-public class MyClass
-{
- ...
-}
-....
-
-So we have defined a fetch group called "otherfield" that just includes
-the field with name _other_. We can then use this at runtime in our
-persistence code.
-
-....
-PersistenceManager pm = pmf.getPersistenceManager();
-pm.getFetchPlan().addGroup("otherfield");
-
-... (load MyClass object)
-....
-
-By default the _FetchPlan_ will include the default fetch group. We have
-changed this above by [.underline]#adding# the fetch group "otherfield",
-so when we retrieve an object using this _PersistenceManager_ we will be
-retrieving the fields _name_ AND _other_ since they are both in the
-current _FetchPlan_. We can take the above much further than what is
-shown by defining nested fetch groups in the MetaData. In addition we
-can change the _FetchPlan_ just before any _PersistenceManager_
-operation to control what is fetched during that operation. The user has
-full flexibility to add many groups to the current *Fetch Plan*. This
-gives much power and control over what will be loaded and when.
-
-The _FetchPlan_ applies not just to calls to
-_PersistenceManager.getObjectById()_, but also to
-_PersistenceManager.newQuery()_, _PersistenceManager.getExtent()_,
-_PersistenceManager.detachCopy_ and much more besides.
-
-You can read more about *named fetch-groups* and how to use it with
-link:attach_detach.html[*attach/detach*]
-
-anchor:dynamic[]
-
-=== Dynamic Fetch Groupsanchor:Dynamic_Fetch_Groups[]
-
-The mechanism above provides static fetch groups defined in XML or
-annotations. That is great when you know in advance what fields you want
-to fetch. In some situations you may want to define your fields to fetch
-at run time. This became standard in JDO2.2 It operates as follows
-
-....
-import org.datanucleus.FetchGroup;
-
-// Create a FetchGroup on the PMF called "TestGroup" for MyClass
-FetchGroup grp = myPMF.getFetchGroup("TestGroup", MyClass.class);
-grp.addMember("field1").addMember("field2");
-
-// Add this group to the fetch plan (using its name)
-fp.addGroup("TestGroup");
-....
-
-So we use the DataNucleus PMF as a way of creating a FetchGroup, and
-then register that FetchGroup with the PMF for use by all PMs. We then
-enable our FetchGroup for use in the FetchPlan by using its group name
-(as we do for a static group). The FetchGroup allows you to add/remove
-the fields necessary so you have full API control over the fields to be
-fetched.
-
-{empty} +
-
-
-=== Fetch Depthanchor:Fetch_Depth[]
-
-The basic fetch group defines which fields are to be fetched. It doesn't
-explicitly define how far down an object graph is to be fetched. JDO
-provides two ways of controlling this.
-
-The first is to set the *maxFetchDepth* for the _FetchPlan_. This value
-specifies how far out from the root object the related objects will be
-fetched. A positive value means that this number of relationships will
-be traversed from the root object. A value of -1 means that no limit
-will be placed on the fetching traversal. The default is 1. Let's take
-an example
-
-....
-public class MyClass1
-{
- MyClass2 field1;
- ...
-}
-
-public class MyClass2
-{
- MyClass3 field2;
- ...
-}
-
-public class MyClass3
-{
- MyClass4 field3;
- ...
-}
-....
-
-and we want to detach _field1_ of instances of _MyClass1_, down 2 levels
-- so detaching the initial "field1" _MyClass2_ object, and its "field2"
-_MyClass3_ instance. So we define our fetch-groups like this
-
-....
-<class name="MyClass1">
- ...
- <fetch-group name="includingField1">
- <field name="field1"/>
- </fetch-group>
-</class>
-<class name="MyClass2">
- ...
- <fetch-group name="includingField2">
- <field name="field2"/>
- </fetch-group>
-</class>
-....
-
-and we then define the *maxFetchDepth* as 2, like this
-
-....
-pm.getFetchPlan().setMaxFetchDepth(2);
-....
-
-A further refinement to this global fetch depth setting is to control
-the fetching of recursive fields. This is performed via a MetaData
-setting "recursion-depth". A value of 1 means that only 1 level of
-objects will be fetched. A value of -1 means there is no limit on the
-amount of recursion. The default is 1. Let's take an example
-
-....
-public class Directory
-{
- Collection children;
- ...
-}
-....
-
-....
-<class name="Directory">
- <field name="children">
- <collection element-type="Directory"/>
- </field>
-
- <fetch-group name="grandchildren">
- <field name="children" recursion-depth="2"/>
- </fetch-group>
- ...
-</class>
-....
-
-So when we fetch a Directory, it will fetch 2 levels of the _children_
-field, hence fetching the children and the grandchildren.
-
-=== Fetch Sizeanchor:Fetch_Size[]
-
-A FetchPlan can also be used for defining the fetching policy when using
-queries. This can be set using
-
-....
-pm.getFetchPlan().setFetchSize(value);
-....
-
-The default is _FetchPlan.FETCH_SIZE_OPTIMAL_ which leaves it to
-DataNucleus to optimise the fetching of instances. A positive value
-defines the number of instances to be fetched. Using
-_FetchPlan.FETCH_SIZE_GREEDY_ means that all instances will be fetched
-immediately.
-
-'''''
-
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/docs/fetchgroups.html b/docs/fetchgroups.html
index 31481f3..7e6588d 100644
--- a/docs/fetchgroups.html
+++ b/docs/fetchgroups.html
@@ -11,9 +11,9 @@
<meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
<meta name="description" content="Apache JDO - Java Data Objects"/>
- <title>JDO TEST</title>
+ <title>Fetch Groups<a id="Fetch_Groups"></a></title>
- <link rel="icon" type="image/png" href="https://tzaeschke.github.io/test-jdo-asciidoc/images/JDO_32x32.png"/>
+ <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
<!--
Apache JDO Documentation Template
@@ -280,25 +280,17 @@ table.CodeRay td.code>pre{padding:0}
<div class="row-fluid">
<div class="col-sm-9">
<div class="page-title">
- <h1>JDO TEST</h1>
+ <h1>Fetch Groups<a id="Fetch_Groups"></a></h1>
</div>
<div id="doc-content">
- <div id="index" class="imageblock" style="text-align: center">
-<div class="content">
-<img src="images/JDOx150.png" alt="JDOx150">
-</div>
-</div>
-<div class="imageblock" style="text-align: center">
-<div class="content">
-<img src="images/jdo_text.png" alt="jdo text">
-</div>
+ <div id="index" class="paragraph">
+<p><span class="image" style="float: left"><img src="images/JDOx150.png" alt="JDOx150"></span>
+<span class="image" style="float: left"><img src="images/jdo_text.png" alt="jdo text"></span></p>
</div>
+<hr>
<div class="sect1">
-<h2 id="_jdo_test">JDO TEST</h2>
+<h2 id="_fetch_groups_a_id_fetch_groups_a">Fetch Groups<a id="Fetch_Groups"></a></h2>
<div class="sectionbody">
-<hr>
-<div class="sect2">
-<h3 id="_fetch_groups_a_id_fetch_groups_a">Fetch Groups<a id="Fetch_Groups"></a></h3>
<div class="paragraph">
<p>When an object is retrieved from the datastore by JDO typically not all
fields are retrieved immediately. This is because for efficiency
@@ -327,7 +319,7 @@ groups at runtime via an API</p>
</div>
<div class="paragraph">
<p>The <strong>fetch group</strong> in use for a class is controled via the <em>FetchPlan</em>
-<a href="http://db.apache.org/jdo/api20/apidocs/javax/jdo/FetchPlan.adoc"><span class="image"><img src="images/javadoc.png" alt="image"></span></a>
+<a href="http://db.apache.org/jdo/api20/apidocs/javax/jdo/FetchPlan.html"><span class="image"><img src="images/javadoc.png" alt="image"></span></a>
interface. To get a handle on the current <em>FetchPlan</em> we do</p>
</div>
<div class="literalblock">
@@ -341,8 +333,8 @@ interface. To get a handle on the current <em>FetchPlan</em> we do</p>
<div class="paragraph">
<p><a id="dfg"></a></p>
</div>
-<div class="sect3">
-<h4 id="_default_fetch_group_a_id_default_fetch_group_a">Default Fetch Group<a id="Default_Fetch_Group"></a></h4>
+<div class="sect2">
+<h3 id="_default_fetch_group_a_id_default_fetch_group_a">Default Fetch Group<a id="Default_Fetch_Group"></a></h3>
<div class="paragraph">
<p>JDO provides an initial fetch group, comprising the fields that will be
retrieved when an object is retrieved if the user does nothing to define
@@ -416,8 +408,8 @@ group at any time you simply do</p>
<p><a id="static"></a></p>
</div>
</div>
-<div class="sect3">
-<h4 id="_named_fetch_groups_a_id_named_fetch_groups_a">Named Fetch Groups<a id="Named_Fetch_Groups"></a></h4>
+<div class="sect2">
+<h3 id="_named_fetch_groups_a_id_named_fetch_groups_a">Named Fetch Groups<a id="Named_Fetch_Groups"></a></h3>
<div class="paragraph">
<p>As mentioned above, JDO allows specification of users own fetch groups.
These are specified in the MetaData of the class. For example, if we
@@ -502,14 +494,14 @@ gives much power and control over what will be loaded and when.</p>
</div>
<div class="paragraph">
<p>You can read more about <strong>named fetch-groups</strong> and how to use it with
-<a href="attach_detach.adoc"><strong>attach/detach</strong></a></p>
+<a href="attach_detach.html"><strong>attach/detach</strong></a></p>
</div>
<div class="paragraph">
<p><a id="dynamic"></a></p>
</div>
</div>
-<div class="sect3">
-<h4 id="_dynamic_fetch_groups_a_id_dynamic_fetch_groups_a">Dynamic Fetch Groups<a id="Dynamic_Fetch_Groups"></a></h4>
+<div class="sect2">
+<h3 id="_dynamic_fetch_groups_a_id_dynamic_fetch_groups_a">Dynamic Fetch Groups<a id="Dynamic_Fetch_Groups"></a></h3>
<div class="paragraph">
<p>The mechanism above provides static fetch groups defined in XML or
annotations. That is great when you know in advance what fields you want
@@ -540,8 +532,8 @@ fetched.</p>
<p><br></p>
</div>
</div>
-<div class="sect3">
-<h4 id="_fetch_depth_a_id_fetch_depth_a">Fetch Depth<a id="Fetch_Depth"></a></h4>
+<div class="sect2">
+<h3 id="_fetch_depth_a_id_fetch_depth_a">Fetch Depth<a id="Fetch_Depth"></a></h3>
<div class="paragraph">
<p>The basic fetch group defines which fields are to be fetched. It doesn’t
explicitly define how far down an object graph is to be fetched. JDO
@@ -640,8 +632,8 @@ amount of recursion. The default is 1. Let’s take an example</p>
field, hence fetching the children and the grandchildren.</p>
</div>
</div>
-<div class="sect3">
-<h4 id="_fetch_size_a_id_fetch_size_a">Fetch Size<a id="Fetch_Size"></a></h4>
+<div class="sect2">
+<h3 id="_fetch_size_a_id_fetch_size_a">Fetch Size<a id="Fetch_Size"></a></h3>
<div class="paragraph">
<p>A FetchPlan can also be used for defining the fetching policy when using
queries. This can be set using</p>
@@ -665,7 +657,6 @@ immediately.</p>
<hr>
</div>
</div>
-</div>
</div>
</div>
</div>
diff --git a/docs/field_types.adoc b/docs/field_types.adoc
deleted file mode 100644
index 459aebf..0000000
--- a/docs/field_types.adoc
+++ /dev/null
@@ -1,604 +0,0 @@
-[[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
-
-'''''
-
-:_basedir:
-:_imagesdir: images/
-:notoc:
-:titlepage:
-:grid: cols
-
-== Supported Java Typesanchor:Supported_Java_Types[]
-
-When persisting a class, a persistence solution needs to know how to
-persist the types of each field in the class. Clearly a persistence
-solution can only support a finite number of Java types. It cannot know
-how to persist every possible type creatable. The JDO specifications
-define lists of types that are required to be supported by all
-implementations of those specifications. This support can be
-conveniently split into two parts
-
-* An object that can be _referred-to_ (object reference, providing a
-relation) and that has an "identity" - *First Class Object (FCO)*. JDO
-requires an implementation to support _PersistenceCapable_ types, as
-well as object/interface fields that refer to _PersistenceCapable_
-objects.
-* An object that does not have an "identity" - *Second Class Object
-(SCO)*. This is something like a String or Date field in a class. It can
-also be a Collection, that contains other objects.
-
-{empty} +
-
-
-=== First-Class (FCO) Typesanchor:First-Class_FCO_Types[]
-
-JDO requires objects that are *PersistenceCapable* to be *FCO*. In
-addition it supports persisting fields of Interface or java.lang.Object
-type as FCO (since these are just references to PersistenceCapable
-objects).
-
-{empty} +
-
-
-=== Second-Class (SCO) Typesanchor:Second-Class_SCO_Types[]
-
-The table below shows the supported *SCO* java types in JDO2. The table
-also shows the default-fetch-group (DFG) setting for that Java type (so
-whether it is retrieved by default when retrieving an object with a
-field of that type), whether the field is persisted by default (if it is
-"false" then you would have to add *persistence-modifier="persistent"*
-to the field for it to be persisted by JDO), and whether the java type
-can be used as part of the primary key.
-
-Java Type
-
-DFG?
-
-Persistent?
-
-PK?
-
-boolean
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-byte
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-char
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-double
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_error_sml.png[image]
-
-float
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_error_sml.png[image]
-
-int
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-long
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-short
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-boolean[]
-
-image:images/icon_error_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_error_sml.png[image]
-
-byte[]
-
-image:images/icon_error_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_error_sml.png[image]
-
-char[]
-
-image:images/icon_error_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_error_sml.png[image]
-
-double[]
-
-image:images/icon_error_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_error_sml.png[image]
-
-float[]
-
-image:images/icon_error_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_error_sml.png[image]
-
-int[]
-
-image:images/icon_error_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_error_sml.png[image]
-
-long[]
-
-image:images/icon_error_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_error_sml.png[image]
-
-short[]
-
-image:images/icon_error_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_error_sml.png[image]
-
-java.lang.Boolean
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-java.lang.Byte
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-java.lang.Character
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-java.lang.Double
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_error_sml.png[image]
-
-java.lang.Float
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_error_sml.png[image]
-
-java.lang.Integer
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-java.lang.Long
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-java.lang.Short
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-java.lang.Boolean[]
-
-image:images/icon_error_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_error_sml.png[image]
-
-java.lang.Byte[]
-
-image:images/icon_error_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_error_sml.png[image]
-
-java.lang.Character[]
-
-image:images/icon_error_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_error_sml.png[image]
-
-java.lang.Double[]
-
-image:images/icon_error_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_error_sml.png[image]
-
-java.lang.Float[]
-
-image:images/icon_error_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_error_sml.png[image]
-
-java.lang.Integer[]
-
-image:images/icon_error_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_error_sml.png[image]
-
-java.lang.Long[]
-
-image:images/icon_error_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_error_sml.png[image]
-
-java.lang.Short[]
-
-image:images/icon_error_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_error_sml.png[image]
-
-java.lang.Number
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_error_sml.png[image]
-
-java.lang.Object
-
-image:images/icon_error_sml.png[image]
-
-image:images/icon_error_sml.png[image]
-
-image:images/icon_error_sml.png[image]
-
-java.lang.String
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-java.lang.String[]
-
-image:images/icon_error_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_error_sml.png[image]
-
-java.math.BigDecimal
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_error_sml.png[image]
-
-java.math.BigInteger
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-java.math.BigDecimal[]
-
-image:images/icon_error_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_error_sml.png[image]
-
-java.math.BigInteger[]
-
-image:images/icon_error_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_error_sml.png[image]
-
-java.sql.Date
-
-image:images/icon_error_sml.png[image]
-
-image:images/icon_error_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-java.sql.Time
-
-image:images/icon_error_sml.png[image]
-
-image:images/icon_error_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-java.sql.Timestamp
-
-image:images/icon_error_sml.png[image]
-
-image:images/icon_error_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-java.util.ArrayList
-
-image:images/icon_error_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_error_sml.png[image]
-
-java.util.Collection
-
-image:images/icon_error_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_error_sml.png[image]
-
-java.util.Currency
-
-image:images/icon_error_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-java.util.Date
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-java.util.Date[]
-
-image:images/icon_error_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_error_sml.png[image]
-
-java.util.HashMap
-
-image:images/icon_error_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_error_sml.png[image]
-
-java.util.HashSet
-
-image:images/icon_error_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_error_sml.png[image]
-
-java.util.Hashtable
-
-image:images/icon_error_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_error_sml.png[image]
-
-java.util.LinkedHashMap
-
-image:images/icon_error_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_error_sml.png[image]
-
-java.util.LinkedHashSet
-
-image:images/icon_error_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_error_sml.png[image]
-
-java.util.LinkedList
-
-image:images/icon_error_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_error_sml.png[image]
-
-java.util.List
-
-image:images/icon_error_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_error_sml.png[image]
-
-java.util.Locale
-
-image:images/icon_error_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-java.util.Locale[]
-
-image:images/icon_error_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_error_sml.png[image]
-
-java.util.Map
-
-image:images/icon_error_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_error_sml.png[image]
-
-java.util.Set
-
-image:images/icon_error_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_error_sml.png[image]
-
-java.util.TreeMap
-
-image:images/icon_error_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_error_sml.png[image]
-
-java.util.TreeSet
-
-image:images/icon_error_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_error_sml.png[image]
-
-java.util.Vector
-
-image:images/icon_error_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_error_sml.png[image]
-
-java.io.Serializable
-
-image:images/icon_error_sml.png[image]
-
-image:images/icon_error_sml.png[image]
-
-image:images/icon_error_sml.png[image]
-
-javax.jdo.spi.PersistenceCapable
-
-image:images/icon_error_sml.png[image]
-
-image:images/icon_error_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-javax.jdo.spi.PersistenceCapable[]
-
-image:images/icon_error_sml.png[image]
-
-image:images/icon_error_sml.png[image]
-
-image:images/icon_error_sml.png[image]
-
-java.lang.Enum
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-java.lang.Enum[]
-
-image:images/icon_error_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-image:images/icon_success_sml.png[image]
-
-'''''
-
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/docs/field_types.html b/docs/field_types.html
index eb6f997..ec8c42b 100644
--- a/docs/field_types.html
+++ b/docs/field_types.html
@@ -11,9 +11,9 @@
<meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
<meta name="description" content="Apache JDO - Java Data Objects"/>
- <title>JDO TEST</title>
+ <title>Supported Java Types<a id="Supported_Java_Types"></a></title>
- <link rel="icon" type="image/png" href="https://tzaeschke.github.io/test-jdo-asciidoc/images/JDO_32x32.png"/>
+ <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
<!--
Apache JDO Documentation Template
@@ -280,25 +280,17 @@ table.CodeRay td.code>pre{padding:0}
<div class="row-fluid">
<div class="col-sm-9">
<div class="page-title">
- <h1>JDO TEST</h1>
+ <h1>Supported Java Types<a id="Supported_Java_Types"></a></h1>
</div>
<div id="doc-content">
- <div id="index" class="imageblock" style="text-align: center">
-<div class="content">
-<img src="images/JDOx150.png" alt="JDOx150">
-</div>
-</div>
-<div class="imageblock" style="text-align: center">
-<div class="content">
-<img src="images/jdo_text.png" alt="jdo text">
-</div>
+ <div id="index" class="paragraph">
+<p><span class="image" style="float: left"><img src="images/JDOx150.png" alt="JDOx150"></span>
+<span class="image" style="float: left"><img src="images/jdo_text.png" alt="jdo text"></span></p>
</div>
+<hr>
<div class="sect1">
-<h2 id="_jdo_test">JDO TEST</h2>
+<h2 id="_supported_java_types_a_id_supported_java_types_a">Supported Java Types<a id="Supported_Java_Types"></a></h2>
<div class="sectionbody">
-<hr>
-<div class="sect2">
-<h3 id="_supported_java_types_a_id_supported_java_types_a">Supported Java Types<a id="Supported_Java_Types"></a></h3>
<div class="paragraph">
<p>When persisting a class, a persistence solution needs to know how to
persist the types of each field in the class. Clearly a persistence
@@ -327,8 +319,8 @@ also be a Collection, that contains other objects.</p>
<div class="paragraph">
<p><br></p>
</div>
-<div class="sect3">
-<h4 id="_first_class_fco_types_a_id_first_class_fco_types_a">First-Class (FCO) Types<a id="First-Class_FCO_Types"></a></h4>
+<div class="sect2">
+<h3 id="_first_class_fco_types_a_id_first_class_fco_types_a">First-Class (FCO) Types<a id="First-Class_FCO_Types"></a></h3>
<div class="paragraph">
<p>JDO requires objects that are <strong>PersistenceCapable</strong> to be <strong>FCO</strong>. In
addition it supports persisting fields of Interface or java.lang.Object
@@ -339,8 +331,8 @@ objects).</p>
<p><br></p>
</div>
</div>
-<div class="sect3">
-<h4 id="_second_class_sco_types_a_id_second_class_sco_types_a">Second-Class (SCO) Types<a id="Second-Class_SCO_Types"></a></h4>
+<div class="sect2">
+<h3 id="_second_class_sco_types_a_id_second_class_sco_types_a">Second-Class (SCO) Types<a id="Second-Class_SCO_Types"></a></h3>
<div class="paragraph">
<p>The table below shows the supported <strong>SCO</strong> java types in JDO2. The table
also shows the default-fetch-group (DFG) setting for that Java type (so
@@ -1173,7 +1165,6 @@ can be used as part of the primary key.</p>
<hr>
</div>
</div>
-</div>
</div>
</div>
</div>
diff --git a/docs/get-involved.adoc b/docs/get-involved.adoc
deleted file mode 100644
index 43e8068..0000000
--- a/docs/get-involved.adoc
+++ /dev/null
@@ -1,58 +0,0 @@
-[[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
-
-'''''
-
-:_basedir:
-:_imagesdir: images/
-:notoc:
-:titlepage:
-:grid: cols
-
-== How do I contribute, give feedback, fix bugs and so on?anchor:How_do_I_contribute_give_feedback_fix_bugs_and_so_on[]
-
-The Apache JDO project really needs and appreciates any contributions,
-including documentation help, source code and feedback. Suggested
-changes should come in the form of source code and/or very detailed and
-constructive feedback.
-
-* Discussion occurs on the link:mail-lists.html[JDO mailing lists]
-* Information on access to the project source code is available
-link:svn.html[here].
-* Bugs and other issues can be posted on the project
-%20http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10630%20[JIRA]
-* Additional documentation and discussion can be found on the project
-http://wiki.apache.org/jdo/[wiki]
-* We have a communications conference call every Friday at 9:00 AM
-Pacific time. The conference call number is 866 230-6968 (international
-865 544-7856) code 294-0479#. During this call we discuss project
-status, issues, concerns, and strategy. Everyone interested in Apache
-JDO is welcome and encouraged to participate.
-
-== How do I become a committer?anchor:How_do_I_become_a_committer[]
-
-If you're interested in committing to the project:
-
-* You'll need to fill out some legal paperwork and go through a process
-to get an apache committer account: See
-http://apache.org/dev/new-committers-guide.html[New Committers Guide],
-http://apache.org/dev/contributors.html[Contributors], and
-http://apache.org/dev/committers.html[Committers] for more details.
-* After you've received an email from root@apache.org with your
-committer account information, change your initial password: Login by
-'ssh -l <username> people.apache.org'; run 'passwd'; run 'svnpasswd'.
-See http://apache.org/dev/version-control.html[Committer Subversion
-Access].
-* Check out the JDO sources and test your svn account:
-http://svn.apache.org/viewcvs.cgi/db/jdo/[SubversionRepository].
-* Sign up for a http://wiki.apache.org/jdo/UserPreferences[WiKi]
-account.
-* Sign up for an http://issues.apache.org/jira/[ASF JIRA] account.
-
-'''''
-
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/docs/get-involved.html b/docs/get-involved.html
index 18a05b3..55363a0 100644
--- a/docs/get-involved.html
+++ b/docs/get-involved.html
@@ -11,9 +11,9 @@
<meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
<meta name="description" content="Apache JDO - Java Data Objects"/>
- <title>JDO TEST</title>
+ <title>How do I contribute, give feedback, fix bugs and so on?<a id="How_do_I_contribute_give_feedback_fix_bugs_and_so_on"></a></title>
- <link rel="icon" type="image/png" href="https://tzaeschke.github.io/test-jdo-asciidoc/images/JDO_32x32.png"/>
+ <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
<!--
Apache JDO Documentation Template
@@ -280,25 +280,17 @@ table.CodeRay td.code>pre{padding:0}
<div class="row-fluid">
<div class="col-sm-9">
<div class="page-title">
- <h1>JDO TEST</h1>
+ <h1>How do I contribute, give feedback, fix bugs and so on?<a id="How_do_I_contribute_give_feedback_fix_bugs_and_so_on"></a></h1>
</div>
<div id="doc-content">
- <div id="index" class="imageblock" style="text-align: center">
-<div class="content">
-<img src="images/JDOx150.png" alt="JDOx150">
-</div>
-</div>
-<div class="imageblock" style="text-align: center">
-<div class="content">
-<img src="images/jdo_text.png" alt="jdo text">
-</div>
+ <div id="index" class="paragraph">
+<p><span class="image" style="float: left"><img src="images/JDOx150.png" alt="JDOx150"></span>
+<span class="image" style="float: left"><img src="images/jdo_text.png" alt="jdo text"></span></p>
</div>
+<hr>
<div class="sect1">
-<h2 id="_jdo_test">JDO TEST</h2>
+<h2 id="_how_do_i_contribute_give_feedback_fix_bugs_and_so_on_a_id_how_do_i_contribute_give_feedback_fix_bugs_and_so_on_a">How do I contribute, give feedback, fix bugs and so on?<a id="How_do_I_contribute_give_feedback_fix_bugs_and_so_on"></a></h2>
<div class="sectionbody">
-<hr>
-<div class="sect2">
-<h3 id="_how_do_i_contribute_give_feedback_fix_bugs_and_so_on_a_id_how_do_i_contribute_give_feedback_fix_bugs_and_so_on_a">How do I contribute, give feedback, fix bugs and so on?<a id="How_do_I_contribute_give_feedback_fix_bugs_and_so_on"></a></h3>
<div class="paragraph">
<p>The Apache JDO project really needs and appreciates any contributions,
including documentation help, source code and feedback. Suggested
@@ -308,11 +300,11 @@ constructive feedback.</p>
<div class="ulist">
<ul>
<li>
-<p>Discussion occurs on the <a href="mail-lists.adoc">JDO mailing lists</a></p>
+<p>Discussion occurs on the <a href="mail-lists.html">JDO mailing lists</a></p>
</li>
<li>
<p>Information on access to the project source code is available
-<a href="svn.adoc">here</a>.</p>
+<a href="svn.html">here</a>.</p>
</li>
<li>
<p>Bugs and other issues can be posted on the project
@@ -332,8 +324,10 @@ JDO is welcome and encouraged to participate.</p>
</ul>
</div>
</div>
-<div class="sect2">
-<h3 id="_how_do_i_become_a_committer_a_id_how_do_i_become_a_committer_a">How do I become a committer?<a id="How_do_I_become_a_committer"></a></h3>
+</div>
+<div class="sect1">
+<h2 id="_how_do_i_become_a_committer_a_id_how_do_i_become_a_committer_a">How do I become a committer?<a id="How_do_I_become_a_committer"></a></h2>
+<div class="sectionbody">
<div class="paragraph">
<p>If you’re interested in committing to the project:</p>
</div>
@@ -342,15 +336,15 @@ JDO is welcome and encouraged to participate.</p>
<li>
<p>You’ll need to fill out some legal paperwork and go through a process
to get an apache committer account: See
-<a href="http://apache.org/dev/new-committers-guide.adoc">New Committers Guide</a>,
-<a href="http://apache.org/dev/contributors.adoc">Contributors</a>, and
-<a href="http://apache.org/dev/committers.adoc">Committers</a> for more details.</p>
+<a href="http://apache.org/dev/new-committers-guide.html">New Committers Guide</a>,
+<a href="http://apache.org/dev/contributors.html">Contributors</a>, and
+<a href="http://apache.org/dev/committers.html">Committers</a> for more details.</p>
</li>
<li>
<p>After you’ve received an email from <a href="mailto:root@apache.org">root@apache.org</a> with your
committer account information, change your initial password: Login by
'ssh -l <username> people.apache.org'; run 'passwd'; run 'svnpasswd'.
-See <a href="http://apache.org/dev/version-control.adoc">Committer Subversion
+See <a href="http://apache.org/dev/version-control.html">Committer Subversion
Access</a>.</p>
</li>
<li>
@@ -372,7 +366,6 @@ account.</p>
</div>
<hr>
</div>
-</div>
</div>
</div>
</div>
diff --git a/docs/glossary.adoc b/docs/glossary.adoc
deleted file mode 100644
index 1961258..0000000
--- a/docs/glossary.adoc
+++ /dev/null
@@ -1,149 +0,0 @@
-[[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
-
-'''''
-
-:_basedir:
-:_imagesdir: images/
-:notoc:
-:titlepage:
-:grid: cols
-
-== JDO Glossaryanchor:JDO_Glossary[]
-
-JDO utilizes some terminology used elsewhere (e.g J2EE) but also
-introduces some terminology that may be new to people. Below is a
-glossary of some common terms that may be encountered.
-
-[cols=",",options="header",]
-|===
-|Term |Definition
-|anchor:application-identity[]####application identity |When the persistence
-of a class is defined in a MetaData file, the developer can decide that
-they want to control the identity of objects of that class. This is
-called *application identity* because the application has the control.
-
-|anchor:attach-detach[]####attach/detach |When you have an object of a class
-that is associated with a PersistenceManager it is referred to as being
-_attached_. If you want to stop persistence of that object you can
-_detach_ the object. This has the effect that any changes to the object
-will not be persisted, and also that the object can be used outside
-transactions.
-
-|anchor:datastore-identity[]####datastore identity |When the persistence of a
-class is defined in a MetaData file, the developer can decide that they
-want the identity of objects of that class to be defined by the JDO
-implementation. This is called *datastore identity*
-
-|anchor:default-fetch-group[]####default-fetch-group (DFG) |When a persisted
-object is retrieved from the datastore its fields can be retrieved with
-it, or optionally can be retrieved only when needed. If a field is in
-the *default-fetch-group* it will be retrieved when the object is
-retrieved. Some field types default to being in the
-*default-fetch-group* (e.g primitives, wrappers to primtives,
-java.util.Date) and others (e.g java.util.Set, java.util.List) don't.
-
-|anchor:embedded[]####embedded |A field can be defined as embedded if it will
-be stored as a column in the table of its containing object.
-
-|anchor:enhancer[]####enhancer |JDO 1.0.1 requires the use of a byte-code
-enhancer that takes the Java compiled classes and "enhances" them,
-adding in information to permit their use in a JDO environment.
-
-|anchor:fco[]####FCO |JDO defines 2 main groups of Java objects. The first is
-those objects that have an identity. These are termed "First Class
-Objects" or FCO for short.
-
-|anchor:fetchgroup[]####Fetch Group |JDO allows a user to define groups of
-fields that should be retrieved (fetched) at the same time. These are
-called a "fetch group". The principal "fetch group" is the "default
-fetch group", where JDO has rules for what fields are in this group. A
-user can define their own group, and make this active so that when
-objects of their type are retrieved, they have control over the fetching
-process.
-
-|anchor:JDOQL[]####JDOQL |JDO introduces its own Java-like query language as a
-datastore independent way of retrieving objects from the datastore. This
-is known as JDOQL (JDO Query Language).
-
-|anchor:nondurable-identity[]####nondurable identity |Where the objects of a
-class should be unique in the JVM but not in the datastore (where an
-RDBMS table doesnt have a PK for example).
-
-|anchor:objectid-class[]####objectid class |When an object of a class is
-persisted, it is assigned an object identity. When the developer has
-chosen to use xref:application-identity[application identity] they can
-assign a class to represent this identity (as a primary key) - this is
-the object id class.
-
-|anchor:optimistic-transaction[]####optimistic transaction |When working with
-long duration transactions it is undesirable to have locking and so the
-assumption is made that the data being updated by the transaction will
-not be modified by any other transaction during the course of the
-(optimistic) transaction. The data is checked just before commit to
-confirm integrity that no data has been changed. See also
-xref:pessimistic-transaction[pessimistic transaction] for the contrary
-type which provides locking.
-
-|anchor:persistence-by-reachability[]####persistence-by-reachability |When you
-call makePersistent() on an object, the object will be persisted and, in
-addition, any other objects reachable from that object (via
-relationships) will also be persisted. This is known as
-*persistence-by-reachability*. This process is repeated at commit() time
-when it checks whether these reachable objects are still reachable and,
-if not, removes them from persistence.
-
-|anchor:persistence-aware[]####persistence-aware |When an class needs to
-access fields of a persistence capable class directly, it should be
-enhanced, and is referred to as "Persistence Aware". If a class uses
-field accessor methods then it doesnt need to become "Persistence
-Aware".
-
-|anchor:persistence-capable[]####persistence-capable (PC) |When an class is
-byte-code enhanced, and has valid MetaData, it is referred to as
-"Persistence Capable". This means that it can be persisted by a JDO
-implementation.
-
-|anchor:persistence-modifier[]####persistence-modifier |When defining the
-persistence of a class, the developer can select particular fields to be
-persisted, and others not depending on their importance in the scope of
-their application. The *persistence-modifier* defines whether a field is
-persistent. If this tag is not specified JDO will assign defaults based
-on the field type (primitives, primitive wrappers, java.util.Data,
-persistence capable fields, etc are by default persistent).
-
-|anchor:persistent[]####persistent |This is an object state where the object
-is persistent in a datastore.
-
-|anchor:pessimistic-transaction[]####pessimistic transaction |This is the
-default transaction type in JDO, and is suitable for shortlived
-operations where there is no other blocking activity during the
-transaction. When data is accessed other transactions are locked out
-from accessing it until the transaction is complete. See also
-xref:optimistic-transaction[optimistic transaction] for the contrary
-type which reduces locking.
-
-|anchor:requires-extent[]####Requires Extent |When the persistent of a class
-is defined, the developer decides if the object will be stored with its
-own identity (in its own table for example) or whether it will be stored
-as part of another object. If it will have its own identity, it will
-require and Extent.
-
-|anchor:sco[]####SCO |JDO defines 2 main groups of Java objects. The second
-group is those objects that don't have an identity. These are termed
-"Second Class Objects" or SCO for short.
-
-|anchor:SQL[]####SQL |JDO allows use of multiple query languages. One of
-these, for use with RDBMS datastores, is SQL.
-
-|anchor:transient[]####transient |This is an object state where the object is
-not persistent.
-|===
-
-'''''
-
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/docs/glossary.html b/docs/glossary.html
index 37ec73a..2ec509f 100644
--- a/docs/glossary.html
+++ b/docs/glossary.html
@@ -11,9 +11,9 @@
<meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
<meta name="description" content="Apache JDO - Java Data Objects"/>
- <title>JDO TEST</title>
+ <title>JDO Glossary<a id="JDO_Glossary"></a></title>
- <link rel="icon" type="image/png" href="https://tzaeschke.github.io/test-jdo-asciidoc/images/JDO_32x32.png"/>
+ <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
<!--
Apache JDO Documentation Template
@@ -280,25 +280,17 @@ table.CodeRay td.code>pre{padding:0}
<div class="row-fluid">
<div class="col-sm-9">
<div class="page-title">
- <h1>JDO TEST</h1>
+ <h1>JDO Glossary<a id="JDO_Glossary"></a></h1>
</div>
<div id="doc-content">
- <div id="index" class="imageblock" style="text-align: center">
-<div class="content">
-<img src="images/JDOx150.png" alt="JDOx150">
-</div>
-</div>
-<div class="imageblock" style="text-align: center">
-<div class="content">
-<img src="images/jdo_text.png" alt="jdo text">
-</div>
+ <div id="index" class="paragraph">
+<p><span class="image" style="float: left"><img src="images/JDOx150.png" alt="JDOx150"></span>
+<span class="image" style="float: left"><img src="images/jdo_text.png" alt="jdo text"></span></p>
</div>
+<hr>
<div class="sect1">
-<h2 id="_jdo_test">JDO TEST</h2>
+<h2 id="_jdo_glossary_a_id_jdo_glossary_a">JDO Glossary<a id="JDO_Glossary"></a></h2>
<div class="sectionbody">
-<hr>
-<div class="sect2">
-<h3 id="_jdo_glossary_a_id_jdo_glossary_a">JDO Glossary<a id="JDO_Glossary"></a></h3>
<div class="paragraph">
<p>JDO utilizes some terminology used elsewhere (e.g J2EE) but also
introduces some terminology that may be new to people. Below is a
@@ -489,7 +481,6 @@ not persistent.</p></td>
</div>
<hr>
</div>
-</div>
</div>
</div>
</div>
diff --git a/docs/guides.adoc b/docs/guides.adoc
deleted file mode 100644
index f6d7ad2..0000000
--- a/docs/guides.adoc
+++ /dev/null
@@ -1,23 +0,0 @@
-[[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
-
-'''''
-
-:_basedir:
-:_imagesdir: images/
-:notoc:
-:titlepage:
-:grid: cols
-
-== Guidesanchor:Guides[]
-
-This section provides guides to the process of introducing JDO into your
-application.
-
-'''''
-
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/docs/guides.html b/docs/guides.html
index de60199..40927ce 100644
--- a/docs/guides.html
+++ b/docs/guides.html
@@ -11,9 +11,9 @@
<meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
<meta name="description" content="Apache JDO - Java Data Objects"/>
- <title>JDO TEST</title>
+ <title>Guides<a id="Guides"></a></title>
- <link rel="icon" type="image/png" href="https://tzaeschke.github.io/test-jdo-asciidoc/images/JDO_32x32.png"/>
+ <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
<!--
Apache JDO Documentation Template
@@ -280,25 +280,17 @@ table.CodeRay td.code>pre{padding:0}
<div class="row-fluid">
<div class="col-sm-9">
<div class="page-title">
- <h1>JDO TEST</h1>
+ <h1>Guides<a id="Guides"></a></h1>
</div>
<div id="doc-content">
- <div id="index" class="imageblock" style="text-align: center">
-<div class="content">
-<img src="images/JDOx150.png" alt="JDOx150">
-</div>
-</div>
-<div class="imageblock" style="text-align: center">
-<div class="content">
-<img src="images/jdo_text.png" alt="jdo text">
-</div>
+ <div id="index" class="paragraph">
+<p><span class="image" style="float: left"><img src="images/JDOx150.png" alt="JDOx150"></span>
+<span class="image" style="float: left"><img src="images/jdo_text.png" alt="jdo text"></span></p>
</div>
+<hr>
<div class="sect1">
-<h2 id="_jdo_test">JDO TEST</h2>
+<h2 id="_guides_a_id_guides_a">Guides<a id="Guides"></a></h2>
<div class="sectionbody">
-<hr>
-<div class="sect2">
-<h3 id="_guides_a_id_guides_a">Guides<a id="Guides"></a></h3>
<div class="paragraph">
<p>This section provides guides to the process of introducing JDO into your
application.</p>
@@ -309,7 +301,6 @@ application.</p>
</div>
<hr>
</div>
-</div>
</div>
</div>
</div>
diff --git a/docs/fetchgroups.html b/docs/guides/maven-jdo.html
similarity index 59%
copy from docs/fetchgroups.html
copy to docs/guides/maven-jdo.html
index 31481f3..3e411cf 100644
--- a/docs/fetchgroups.html
+++ b/docs/guides/maven-jdo.html
@@ -13,7 +13,7 @@
<title>JDO TEST</title>
- <link rel="icon" type="image/png" href="https://tzaeschke.github.io/test-jdo-asciidoc/images/JDO_32x32.png"/>
+ <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
<!--
Apache JDO Documentation Template
@@ -285,378 +285,318 @@ table.CodeRay td.code>pre{padding:0}
<div id="doc-content">
<div id="index" class="imageblock" style="text-align: center">
<div class="content">
-<img src="images/JDOx150.png" alt="JDOx150">
+<img src="../images/JDOx150.png" alt="JDOx150">
</div>
</div>
<div class="imageblock" style="text-align: center">
<div class="content">
-<img src="images/jdo_text.png" alt="jdo text">
+<img src="../images/jdo_text.png" alt="jdo text">
</div>
</div>
<div class="sect1">
<h2 id="_jdo_test">JDO TEST</h2>
<div class="sectionbody">
<hr>
-<div class="sect2">
-<h3 id="_fetch_groups_a_id_fetch_groups_a">Fetch Groups<a id="Fetch_Groups"></a></h3>
-<div class="paragraph">
-<p>When an object is retrieved from the datastore by JDO typically not all
-fields are retrieved immediately. This is because for efficiency
-purposes only particular field types are retrieved in the initial access
-of the object, and then any other objects are retrieved when accessed
-(lazy loading). The group of fields that are loaded is called a <strong>fetch
-group</strong>. There are 3 types of "fetch groups" to consider</p>
</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="#dfg">Default Fetch Group</a> : defined in all JDO specs, containing
-the fields of a class that will be retrieved by default (with no user
-specification).</p>
-</li>
-<li>
-<p><a href="#static">Named Fetch Groups</a> : defined by the JDO2 specification,
-and defined in MetaData (XML/annotations) with the fields of a class
-that are part of that fetch group. The definition here is <em>static</em></p>
-</li>
-<li>
-<p><a href="#dynamic">Dynamic Fetch Groups</a> : Programmatic definition of fetch
-groups at runtime via an API</p>
-</li>
-</ul>
</div>
+<div class="sect1">
+<h2 id="_jdo_meets_maven_a_id_jdo_meets_maven_a">JDO Meets Maven<a id="JDO_Meets_Maven"></a></h2>
+<div class="sectionbody">
<div class="paragraph">
-<p>The <strong>fetch group</strong> in use for a class is controled via the <em>FetchPlan</em>
-<a href="http://db.apache.org/jdo/api20/apidocs/javax/jdo/FetchPlan.adoc"><span class="image"><img src="images/javadoc.png" alt="image"></span></a>
-interface. To get a handle on the current <em>FetchPlan</em> we do</p>
+<p>By <a href="mailto:andy@jpox.org">Andy Jefferson</a></p>
</div>
-<div class="literalblock">
-<div class="content">
-<pre>FetchPlan fp = pm.getFetchPlan();</pre>
+<div class="sect2">
+<h3 id="_background_maven_a_id_background_maven_a">Background - Maven<a id="Background_-_Maven"></a></h3>
+<div class="paragraph">
+<p><a href="http://maven.apache.org">Maven</a> is a tool for managing and building
+projects providing an alternative to the accepted
+<a href="http://ant.apache.org">Ant</a> build process. Maven is almost totally
+plugin-driven, and provides plugins for many common tasks (for example:
+building EJB components such as WARs and EARs, generating documentation,
+running unit tests) and related software (for example:
+<a href="http://checkstyle.sf.net">Checkstyle</a>, <a href="http://pmd.sf.net">PMD</a>,
+<a href="http://www.thecortex.net/clover">Clover</a>,
+<a href="http://www.jcoverage.com">JCoverage</a>).</p>
</div>
+<div class="paragraph">
+<p>Maven builds on top of the definition of a project. It formalises
+project definitions such as dependencies (and hence classpaths),
+versions, source repositories, mailing lists, etc. This project
+definition provides placeholders for all of the typical metrics
+important to a project. It formalises the location of the source tree
+for a project and of the unit tests. This rigorous structure allows
+Maven’s plugins to provide generalised functionality such as building
+the source tree, running the unit tests, generating javadoc, code
+analysis, etc.</p>
</div>
<div class="paragraph">
-<p><br></p>
+<p>Maven operates using the concept of <strong>goals</strong>. Each <strong>goal</strong> can have "pre"
+and "post" goals. This structure allows for chaining of operations, with
+one operation firing off another, and another to achieve some overall
+end result.</p>
</div>
+</div>
+<div class="sect2">
+<h3 id="_integrating_jdo_with_maven_a_id_integrating_jdo_with_maven_a">Integrating JDO with Maven<a id="Integrating_JDO_with_Maven"></a></h3>
<div class="paragraph">
-<p><a id="dfg"></a></p>
+<p>In developing a JDO system, the developer has many concerns - not least
+the likes of object-relationship mapping - and should, as far as
+possible, be spared the "administrative" burdens associated with
+building the system. Maven’s formalization of the source tree structure
+and chaining of actions helps achieve this objective by saving the
+developer from having to explicitly define tasks like JDO class
+bytecode-enhancement. Thus, rather than explicitly invoking a
+bytecode-enhancement task in the system build, Maven is able to provide
+this activity by way of a plugin, which could even be automatically
+chained off the existing Java compilation task.</p>
</div>
-<div class="sect3">
-<h4 id="_default_fetch_group_a_id_default_fetch_group_a">Default Fetch Group<a id="Default_Fetch_Group"></a></h4>
+</div>
+<div class="sect2">
+<h3 id="_anatomy_of_a_maven_jdo_plugin_a_id_anatomy_of_a_maven_jdo_plugin_a">Anatomy of a Maven JDO plugin<a id="Anatomy_of_a_Maven_JDO_plugin"></a></h3>
<div class="paragraph">
-<p>JDO provides an initial fetch group, comprising the fields that will be
-retrieved when an object is retrieved if the user does nothing to define
-the required behaviour. By default the <em>default fetch group</em> comprises
-all fields of the following types :-</p>
+<p>A Maven plugin can use a variety of languages, however most commonly
+utilises <a href="http://jakarta.apache.org/commons/jelly/">Jelly scripting
+language</a>, at least for definition of the plugin’s goals. A Maven plugin
+typically requires a minimum of 3 files …​</p>
</div>
<div class="ulist">
<ul>
<li>
-<p>primitives : boolean, byte, char, double, float, int, long, short</p>
-</li>
-<li>
-<p>Object wrappers of primitives : Boolean, Byte, Character, Double,
-Float, Integer, Long, Short</p>
+<p><em>project.xml</em> (defining the dependencies of the plugin on other
+software)</p>
</li>
<li>
-<p>java.lang.String, java.lang.Number, java.lang.Enum</p>
+<p><em>plugin.jelly</em> (providing the <strong>goals</strong> definition)</p>
</li>
<li>
-<p>java.math.BigDecimal, java.math.BigInteger</p>
-</li>
-<li>
-<p>java.util.Date</p>
+<p><em>plugin.properties</em> (properties available for configuration)</p>
</li>
</ul>
</div>
<div class="paragraph">
-<p>If you wish to change the <strong>Default Fetch Group</strong> for a class you can
-update the Meta-Data for the class as follows (for XML)</p>
-</div>
-<div class="literalblock">
-<div class="content">
-<pre><class name="MyClass">
- ...
- <field name="fieldX" default-fetch-group="true"/>
-</class></pre>
-</div>
+<p>Maven plugins can use a variety of other scripting and templating
+utilities, however these are not currently required for the JDO plugins
+implemented.</p>
</div>
<div class="paragraph">
-<p>or using annotations</p>
+<p>Plugins have now been developed for <a href="http://www.jpox.org">JPOX</a>, and
+<a href="http://tjdo.sf.net">TJDO</a>, though can readily be developed for any JDO
+implementation. The best way of understanding the process involved is by
+analysing a Maven JDO plugin - in this case, the JPOX plugin. Here the
+<em>plugin.jelly</em> file is as follows:</p>
</div>
<div class="literalblock">
<div class="content">
-<pre>@Persistent(defaultFetchGroup="true")
-SomeType fieldX;</pre>
-</div>
-</div>
-<div class="paragraph">
-<p>When a <em>PersistenceManager</em> is created it starts with a FetchPlan of the
-"default" fetch group. That is, if we call</p>
-</div>
-<div class="literalblock">
-<div class="content">
-<pre>Collection fetchGroups = fp.getGroups();</pre>
-</div>
-</div>
-<div class="paragraph">
-<p>this will have one group, called "default". At runtime, if you have been
-using other fetch groups and want to revert back to the default fetch
-group at any time you simply do</p>
-</div>
-<div class="literalblock">
-<div class="content">
-<pre>fp.setGroup(FetchPlan.DEFAULT);</pre>
-</div>
+<pre><goal name="jpox"
+ description="Enhance classes for use with Java Persistent Objects (JPOX)"
+ prereqs="jpox:enhance"/>
+
+<goal name="jpox:init">
+ ... snip ... code to generate jpoxClasspath and jpoxMetaDataFiles
+</goal>
+
+<goal name="jpox:enhance"
+ description="Perform the enhancement of classes for use with JPOX"
+ prereqs="jpox:init">
+ <echo>JDO-enhancing classes for Java Persistent Objects</echo>
+
+ <ant:java dir="${maven.build.dest}"
+ classname="org.jpox.enhance.SunReferenceEnhancer"
+ failonerror="true"
+ fork="true">
+ <classpath refid="jpoxClasspath"/>
+ <arg line="${jpoxMetaDataFiles}"/>
+ </ant:java>
+
+ <echo>Classes are now JDO-enhanced for Java Persistent Objects</echo>
+</goal></pre>
</div>
-<div class="paragraph">
-<p><br></p>
</div>
<div class="paragraph">
-<p><a id="static"></a></p>
+<p>It can be seen that the plugin has several goals, the default one being
+to run the enhance goal. Since this goal requires (as a prerequisite)
+the running of the init goal, they are chained.</p>
</div>
-</div>
-<div class="sect3">
-<h4 id="_named_fetch_groups_a_id_named_fetch_groups_a">Named Fetch Groups<a id="Named_Fetch_Groups"></a></h4>
<div class="paragraph">
-<p>As mentioned above, JDO allows specification of users own fetch groups.
-These are specified in the MetaData of the class. For example, if we
-have the following class</p>
+<p>Some JDO implementations (for example JPOX, or Kodo) allow the
+generation of the JDO database schema prior to running the JDO-enabled
+application. This is catered for with additional <strong>goal(s)</strong>. For JPOX
+again, this is handled as follows</p>
</div>
<div class="literalblock">
<div class="content">
-<pre>class MyClass
-{
- String name;
- HashSet coll;
- MyOtherClass other;
-}</pre>
+<pre><goal name="jpox:schema-create"
+ prereqs="jpox:init">
+ <echo>Creating tables for Persistence Capability</echo>
+
+ <ant:java dir="${maven.build.dest}"
+ classname="org.jpox.SchemaTool"
+ failonerror="true"
+ fork="true">
+ <classpath refid="jpoxClasspath"/>
+ <sysproperty key="database.driver" value="${maven.jpox.database.driver}"/>
+ <sysproperty key="database.url" value="${maven.jpox.database.url}"/>
+ <sysproperty key="database.user" value="${maven.jpox.database.user}"/>
+ <sysproperty key="database.password" value="${maven.jpox.database.password}"/>
+ <arg line="-create"/>
+ <arg line="${jpoxMetaDataFiles}"/>
+ </ant:java>
+</goal>
+
+<goal name="jpox:schema-delete"
+ prereqs="jpox:init">
+ <echo>Deleting tables for Persistence Capability</echo>
+
+ <ant:java dir="${maven.build.dest}"
+ classname="org.jpox.SchemaTool"
+ failonerror="true"
+ fork="true">
+ <classpath refid="jpoxClasspath"/>
+ <sysproperty key="database.driver" value="${maven.jpox.database.driver}"/>
+ <sysproperty key="database.url" value="${maven.jpox.database.url}"/>
+ <sysproperty key="database.user" value="${maven.jpox.database.user}"/>
+ <sysproperty key="database.password" value="${maven.jpox.database.password}"/>
+ <arg line="-delete"/>
+ <arg line="${jpoxMetaDataFiles}"/>
+ </ant:java>
+ </goal></pre>
</div>
</div>
<div class="paragraph">
-<p>and we want to have the <span class="underline">other</span> field loaded whenever we
-load objects of this class, we define our MetaData as</p>
-</div>
-<div class="literalblock">
-<div class="content">
-<pre><package name="mydomain">
- <class name="MyClass">
- <field name="name">
- <column length="100" jdbc-type="VARCHAR"/>
- </field>
- <field name="coll" persistence-modifier="persistent">
- <collection element-type="mydomain.Address"/>
- <join/>
- </field>
- <field name="other" persistence-modifier="persistent"/>
- <fetch-group name="otherfield">
- <field name="other"/>
- </fetch-group>
- </class>
-</package></pre>
-</div>
+<p>Hence there are 2 additional <strong>goals</strong>, one for creating all tables
+required by JPOX, and a second for deleting these tables. Clearly this
+has more relevance to <strong>schema generation</strong> than for <strong>existing schemas</strong></p>
</div>
<div class="paragraph">
-<p>or using annotations</p>
-</div>
-<div class="literalblock">
-<div class="content">
-<pre>@PersistenceCapable
-@FetchGroup(name="otherfield", members={@Persistent(name="other")})
-public class MyClass
-{
- ...
-}</pre>
+<p>Where a JDO implementation allows a particular configuration operation,
+a Maven plugin <strong>goal</strong> can be added to deliver this functionality to the
+Maven user. As a result, individual implementations can add as many
+goals as they wish to fulfil their users requirements.</p>
</div>
</div>
+<div class="sect2">
+<h3 id="_using_a_maven_jdo_plugin_a_id_using_a_maven_jdo_plugin_a">Using a Maven JDO plugin<a id="Using_a_Maven_JDO_plugin"></a></h3>
<div class="paragraph">
-<p>So we have defined a fetch group called "otherfield" that just includes
-the field with name <em>other</em>. We can then use this at runtime in our
-persistence code.</p>
+<p>Using the JPOX Maven plugin as an example, the basic enhancement process
+could be invoked as follows:</p>
</div>
<div class="literalblock">
<div class="content">
-<pre>PersistenceManager pm = pmf.getPersistenceManager();
-pm.getFetchPlan().addGroup("otherfield");
-
-... (load MyClass object)</pre>
+<pre>maven jpox:enhance</pre>
</div>
</div>
<div class="paragraph">
-<p>By default the <em>FetchPlan</em> will include the default fetch group. We have
-changed this above by <span class="underline">adding</span> the fetch group "otherfield",
-so when we retrieve an object using this <em>PersistenceManager</em> we will be
-retrieving the fields <em>name</em> AND <em>other</em> since they are both in the
-current <em>FetchPlan</em>. We can take the above much further than what is
-shown by defining nested fetch groups in the MetaData. In addition we
-can change the <em>FetchPlan</em> just before any <em>PersistenceManager</em>
-operation to control what is fetched during that operation. The user has
-full flexibility to add many groups to the current <strong>Fetch Plan</strong>. This
-gives much power and control over what will be loaded and when.</p>
-</div>
-<div class="paragraph">
-<p>The <em>FetchPlan</em> applies not just to calls to
-<em>PersistenceManager.getObjectById()</em>, but also to
-<em>PersistenceManager.newQuery()</em>, <em>PersistenceManager.getExtent()</em>,
-<em>PersistenceManager.detachCopy</em> and much more besides.</p>
-</div>
-<div class="paragraph">
-<p>You can read more about <strong>named fetch-groups</strong> and how to use it with
-<a href="attach_detach.adoc"><strong>attach/detach</strong></a></p>
-</div>
-<div class="paragraph">
-<p><a id="dynamic"></a></p>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_dynamic_fetch_groups_a_id_dynamic_fetch_groups_a">Dynamic Fetch Groups<a id="Dynamic_Fetch_Groups"></a></h4>
-<div class="paragraph">
-<p>The mechanism above provides static fetch groups defined in XML or
-annotations. That is great when you know in advance what fields you want
-to fetch. In some situations you may want to define your fields to fetch
-at run time. This became standard in JDO2.2 It operates as follows</p>
+<p>The problem with this is that it burdens the developer with having to
+explicitly invoke the enhancement process. As an alternative it is
+possible to integrate bytecode enhancement as an automatic step chained
+off the basic Java compilation process. This is achieved by including
+the following in the project <em>maven.xml</em> file:</p>
</div>
<div class="literalblock">
<div class="content">
-<pre>import org.datanucleus.FetchGroup;
-
-// Create a FetchGroup on the PMF called "TestGroup" for MyClass
-FetchGroup grp = myPMF.getFetchGroup("TestGroup", MyClass.class);
-grp.addMember("field1").addMember("field2");
-
-// Add this group to the fetch plan (using its name)
-fp.addGroup("TestGroup");</pre>
-</div>
-</div>
-<div class="paragraph">
-<p>So we use the DataNucleus PMF as a way of creating a FetchGroup, and
-then register that FetchGroup with the PMF for use by all PMs. We then
-enable our FetchGroup for use in the FetchPlan by using its group name
-(as we do for a static group). The FetchGroup allows you to add/remove
-the fields necessary so you have full API control over the fields to be
-fetched.</p>
-</div>
-<div class="paragraph">
-<p><br></p>
+<pre><postGoal name="java:compile">
+ <attainGoal name="jpox:enhance"/>
+</postGoal></pre>
</div>
</div>
-<div class="sect3">
-<h4 id="_fetch_depth_a_id_fetch_depth_a">Fetch Depth<a id="Fetch_Depth"></a></h4>
<div class="paragraph">
-<p>The basic fetch group defines which fields are to be fetched. It doesn’t
-explicitly define how far down an object graph is to be fetched. JDO
-provides two ways of controlling this.</p>
+<p>So wherever the <strong>java:compile</strong> goal is called, as a postGoal it runs the
+<strong>jpox:enhance</strong> goal, leaving the developer with JDO enabled classes
+ready to run.</p>
</div>
<div class="paragraph">
-<p>The first is to set the <strong>maxFetchDepth</strong> for the <em>FetchPlan</em>. This value
-specifies how far out from the root object the related objects will be
-fetched. A positive value means that this number of relationships will
-be traversed from the root object. A value of -1 means that no limit
-will be placed on the fetching traversal. The default is 1. Let’s take
-an example</p>
-</div>
-<div class="literalblock">
-<div class="content">
-<pre>public class MyClass1
-{
- MyClass2 field1;
- ...
-}
-
-public class MyClass2
-{
- MyClass3 field2;
- ...
-}
-
-public class MyClass3
-{
- MyClass4 field3;
- ...
-}</pre>
+<p>Maven’s plugins can be made configurable using properties specified in
+the <em>plugin.properties</em> file. For the JPOX plugin, the following
+properties can be set</p>
</div>
+<div class="ulist">
+<ul>
+<li>
+<p><strong>maven.jpox.jdo.fileset.dir</strong> : Directory containing the JDO MetaData
+files</p>
+</li>
+<li>
+<p><strong>maven.jpox.jdo.fileset.include</strong> : Fileset include path for JDO
+MetaData files (default: <strong>*/</strong>.jdo)</p>
+</li>
+<li>
+<p><strong>maven.jpox.jdo.fileset.exclude</strong> : Fileset exclude path for JDO
+MetaData files</p>
+</li>
+<li>
+<p><strong>maven.jpox.database.driver</strong> : Driver for use in connecting to
+datastore</p>
+</li>
+<li>
+<p><strong>maven.jpox.database.url</strong> : URL defining the datastore</p>
+</li>
+<li>
+<p><strong>maven.jpox.database.user</strong> : Login name for the datastore</p>
+</li>
+<li>
+<p><strong>maven.jpox.database.password</strong> : Password for the datastore</p>
+</li>
+</ul>
</div>
<div class="paragraph">
-<p>and we want to detach <em>field1</em> of instances of <em>MyClass1</em>, down 2 levels
-- so detaching the initial "field1" <em>MyClass2</em> object, and its "field2"
-<em>MyClass3</em> instance. So we define our fetch-groups like this</p>
+<p>For example, the following properties could be included in the Maven
+<em>project.properties</em> file</p>
</div>
<div class="literalblock">
<div class="content">
-<pre><class name="MyClass1">
- ...
- <fetch-group name="includingField1">
- <field name="field1"/>
- </fetch-group>
-</class>
-<class name="MyClass2">
- ...
- <fetch-group name="includingField2">
- <field name="field2"/>
- </fetch-group>
-</class></pre>
+<pre>maven.jpox.jdo.fileset.dir=${basedir}/jdo
+maven.jpox.jdo.fileset.include=**/*.jdo
+maven.jpox.database.driver=com.mysql.jdbc.Driver
+maven.jpox.database.url=jdbc:mysql://localhost/jpox
+maven.jpox.database.user={my_username}
+maven.jpox.database.password={my_password}</pre>
</div>
</div>
<div class="paragraph">
-<p>and we then define the <strong>maxFetchDepth</strong> as 2, like this</p>
-</div>
-<div class="literalblock">
-<div class="content">
-<pre>pm.getFetchPlan().setMaxFetchDepth(2);</pre>
-</div>
+<p>This would define the JDO MetaData files residing under the "jdo"
+project directory, with names matching <strong>.jdo and would be used when all
+JDO plugin *goals</strong> (such as <strong>enhance</strong>) are called. The 4 <strong>database</strong>
+properties are used in the <strong>schema-create/schema-delete</strong> goals (as seen
+in the <em>plugin.jelly</em> file earlier).</p>
</div>
<div class="paragraph">
-<p>A further refinement to this global fetch depth setting is to control
-the fetching of recursive fields. This is performed via a MetaData
-setting "recursion-depth". A value of 1 means that only 1 level of
-objects will be fetched. A value of -1 means there is no limit on the
-amount of recursion. The default is 1. Let’s take an example</p>
-</div>
-<div class="literalblock">
-<div class="content">
-<pre>public class Directory
-{
- Collection children;
- ...
-}</pre>
-</div>
+<p>Invocation of the JPOX schema-create optional goal could be achieved as
+follows:</p>
</div>
<div class="literalblock">
<div class="content">
-<pre><class name="Directory">
- <field name="children">
- <collection element-type="Directory"/>
- </field>
-
- <fetch-group name="grandchildren">
- <field name="children" recursion-depth="2"/>
- </fetch-group>
- ...
-</class></pre>
-</div>
+<pre>maven jpox:schema-create</pre>
</div>
-<div class="paragraph">
-<p>So when we fetch a Directory, it will fetch 2 levels of the <em>children</em>
-field, hence fetching the children and the grandchildren.</p>
</div>
</div>
-<div class="sect3">
-<h4 id="_fetch_size_a_id_fetch_size_a">Fetch Size<a id="Fetch_Size"></a></h4>
+<div class="sect2">
+<h3 id="_conclusion_a_id_conclusion_a">Conclusion<a id="Conclusion"></a></h3>
<div class="paragraph">
-<p>A FetchPlan can also be used for defining the fetching policy when using
-queries. This can be set using</p>
+<p>This article has attempted to give a feel for both the operation of
+Maven, and how to integrate JDO into a Maven project. The various Maven
+JDO plugins can be downloaded as follows</p>
</div>
-<div class="literalblock">
-<div class="content">
-<pre>pm.getFetchPlan().setFetchSize(value);</pre>
+<div class="ulist">
+<ul>
+<li>
+<p>JPOX (1.1.8) - <a href="http://www.jpox.org/">Java Persistent Objects (JPOX)
+project</a></p>
+</li>
+<li>
+<p>TJDO (2.0-beta3) - <a href="http://www.ibiblio.org/maven/maven/plugins/">Ibiblio
+site</a></p>
+</li>
+</ul>
</div>
</div>
+<div class="sect2">
+<h3 id="_about_the_author_a_id_about_the_author_a">About the author<a id="About_the_author"></a></h3>
<div class="paragraph">
-<p>The default is <em>FetchPlan.FETCH_SIZE_OPTIMAL</em> which leaves it to
-DataNucleus to optimise the fetching of instances. A positive value
-defines the number of instances to be fetched. Using
-<em>FetchPlan.FETCH_SIZE_GREEDY</em> means that all instances will be fetched
-immediately.</p>
+<p>Andy Jefferson is an independent software consultant who has been
+working in the IT industry for more than 15 years, primarily in the
+United Kingdom. He is an active participator in several OpenSource
+projects, primarily JPOX, and Apache JDO, and a member of the JSR243
+(JDO2) Expert Group.</p>
</div>
<hr>
<div id="footer" class="paragraph">
@@ -665,7 +605,6 @@ immediately.</p>
<hr>
</div>
</div>
-</div>
</div>
</div>
</div>
diff --git a/docs/class_types.html b/docs/guides/replication.html
similarity index 79%
copy from docs/class_types.html
copy to docs/guides/replication.html
index 69fc7dd..392f02e 100644
--- a/docs/class_types.html
+++ b/docs/guides/replication.html
@@ -13,7 +13,7 @@
<title>JDO TEST</title>
- <link rel="icon" type="image/png" href="https://tzaeschke.github.io/test-jdo-asciidoc/images/JDO_32x32.png"/>
+ <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
<!--
Apache JDO Documentation Template
@@ -297,88 +297,163 @@ table.CodeRay td.code>pre{padding:0}
<h2 id="_jdo_test">JDO TEST</h2>
<div class="sectionbody">
<hr>
-<div class="sect2">
-<h3 id="_jdo_class_types_a_id_jdo_class_types_a">JDO Class Types<a id="JDO_Class_Types"></a></h3>
-<div class="paragraph">
-<p>JDO provides a means of transparent persistence of objects of user
-defined classes. With JDO there are actually 3 types of classes.</p>
</div>
-<div class="ulist">
-<ul>
-<li>
-<p><strong>Persistence Capable</strong> classes are classes whose instances can be
-persisted to a datastore. JDO provide the mechanism for persisting these
-instances, and they are core to JDO. These classes need to be <em>enhanced</em>
-according to a JDO Meta-Data specification before use within a JDO
-environment.</p>
-</li>
-<li>
-<p><strong>Persistence Aware</strong> classes are classes that manipulate Persistence
-Capable instances through direct attribute manipulation. These classes
-are typically enhanced with very minimal JDO Meta-Data. The enhancement
-process performs very little changes to these classes.</p>
-</li>
-<li>
-<p><strong>Normal</strong> classes are classes that aren’t themselves persistable, and
-have no knowledge of persistence either. These classes are totally
-unchanged in JDO, and require no JDO Meta-Data whatsoever.</p>
-</li>
-</ul>
</div>
-<div class="sect3">
-<h4 id="_persistencecapable_a_id_persistencecapable_a">PersistenceCapable<a id="PersistenceCapable"></a></h4>
+<div class="sect1">
+<h2 id="_data_replication_a_id_data_replication_a">Data Replication<a id="Data_Replication"></a></h2>
+<div class="sectionbody">
<div class="paragraph">
-<p>Classes are defined as <strong>PersistenceCapable</strong> either by XML MetaData, like
-this</p>
+<p>There are times when you need to replicate data between datastores. In
+many cases datastores themselves provide a means of doing this, however
+if you want to avoid using datastore-specific functionality you can
+utilise JDO to perform this task. JDO2 allows replication by use of
+detach/attach functionality. We demonstrate this with an example</p>
</div>
<div class="literalblock">
<div class="content">
-<pre><class name="MyClass">
+<pre>public class ElementHolder
+{
+ long id;
+ private Set elements = new HashSet();
+
...
-</class></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>or, in JDO2.1, using Annotations. Like this</p>
-</div>
-<div class="literalblock">
-<div class="content">
-<pre>@PersistenceCapable
-public class MyClass
+}
+
+public class Element
+{
+ String name;
+
+ ...
+}
+
+public class SubElement extends Element
{
+ double value;
+
...
}</pre>
</div>
</div>
<div class="paragraph">
-<p><br></p>
+<p>so we have a 1-N unidirectional (Set) relation, and we define the
+metadata like this</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre><jdo>
+ <package name="org.apache.jdo.test">
+ <class name="ElementHolder" identity-type="application" detachable="true">
+ <inheritance strategy="new-table"/>
+ <field name="id" primary-key="true"/>
+ <field name="elements" persistence-modifier="persistent">
+ <collection element-type="Element"/>
+ <join/>
+ </field>
+ </class>
+
+ <class name="Element" identity-type="application" detachable="true">
+ <inheritance strategy="new-table"/>
+ <field name="name" primary-key="true"/>
+ </class>
+
+ <class name="SubElement">
+ <inheritance strategy="new-table"/>
+ <field name="value"/>
+ </class>
+ </package>
+</jdo></pre>
</div>
</div>
-<div class="sect3">
-<h4 id="_persistenceaware_a_id_persistenceaware_a">PersistenceAware<a id="PersistenceAware"></a></h4>
<div class="paragraph">
-<p>Classes are defined as <strong>PersistenceAware</strong> either by XML MetaData, like
+<p>and so in our application we create some objects in <em>datastore1</em>, like
this</p>
</div>
<div class="literalblock">
<div class="content">
-<pre><class name="MyClass" persistence-modifier="persistence-aware"/></pre>
+<pre>PersistenceManagerFactory pmf1 = JDOHelper.getPersistenceManagerFactory("jdo.1.properties");
+PersistenceManager pm1 = pmf1.getPersistenceManager();
+Transaction tx1 = pm1.currentTransaction();
+Object holderId = null;
+try
+{
+ tx1.begin();
+
+ ElementHolder holder = new ElementHolder(101);
+ holder.addElement(new Element("First Element"));
+ holder.addElement(new Element("Second Element"));
+ holder.addElement(new SubElement("First Inherited Element"));
+ holder.addElement(new SubElement("Second Inherited Element"));
+ pm1.makePersistent(holder);
+
+ tx1.commit();
+ holderId = JDOHelper.getObjectId(holder);
+}
+finally
+{
+ if (tx1.isActive())
+ {
+ tx1.rollback();
+ }
+ pm1.close();
+}</pre>
</div>
</div>
<div class="paragraph">
-<p>or, in JDO2.1, using Annotations. Like this</p>
+<p>and now we want to replicate these objects into <em>datastore2</em>, so we
+detach them from <em>datastore1</em> and attach them to <em>datastore2</em>, like this</p>
</div>
<div class="literalblock">
<div class="content">
-<pre>@PersistenceAware
-public class MyClass
+<pre>// Detach the objects from "datastore1"
+ElementHolder detachedHolder = null;
+pm1 = pmf1.getPersistenceManager();
+tx1 = pm1.currentTransaction();
+try
{
- ...
+ pm1.getFetchPlan().setGroups(new String[] {FetchPlan.DEFAULT, FetchPlan.ALL});
+ pm1.getFetchPlan().setMaxFetchDepth(-1);
+
+ tx1.begin();
+
+ ElementHolder holder = (ElementHolder) pm1.getObjectById(holderID);
+ detachedHolder = (ElementHolder) pm1.detachCopy(holder);
+
+ tx1.commit();
+}
+finally
+{
+ if (tx1.isActive())
+ {
+ tx1.rollback();
+ }
+ pm1.close();
+}
+
+// Attach the objects to datastore2
+PersistenceManagerFactory pmf2 = JDOHelper.getPersistenceManagerFactory("jdo.2.properties");
+PersistenceManager pm2 = pmf2.getPersistenceManager();
+Transaction tx2 = pm2.currentTransaction();
+try
+{
+ tx2.begin();
+
+ pm2.makePersistent(detachedHolder);
+
+ tx2.commit();
+}
+finally
+{
+ if (tx2.isActive())
+ {
+ tx2.rollback();
+ }
+ pm2.close();
}</pre>
</div>
</div>
<div class="paragraph">
-<p><br></p>
+<p>These objects are now replicated into <em>datastore2</em>. Clearly you can
+extend this basic idea and replicate large amounts of data.</p>
</div>
<hr>
<div id="footer" class="paragraph">
@@ -386,8 +461,6 @@ public class MyClass
</div>
<hr>
</div>
-</div>
-</div>
</div>
</div>
</div>
diff --git a/docs/impls.adoc b/docs/impls.adoc
deleted file mode 100644
index 0e90a9c..0000000
--- a/docs/impls.adoc
+++ /dev/null
@@ -1,95 +0,0 @@
-[[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
-
-'''''
-
-:_basedir:
-:_imagesdir: images/
-:notoc:
-:titlepage:
-:grid: cols
-
-== JDO Implementationsanchor:JDO_Implementations[]
-
-To build and run your JDO application, you need a JDO implementation.
-This page lists commercial and non-commercial JDO implementations. For
-information on how vendors certify compliance with the JDO
-specifications, see link:tck.html[TCK].
-
-=== JDO Reference Implementationsanchor:JDO_Reference_Implementations[]
-
-* *JDO 1.0* :
-http://jcp.org/aboutJava/communityprocess/final/jsr012/index2.html[FOStore]
-* *JDO 2.0* : https://sourceforge.net/projects/jpox/[JPOX 1.1]
-* *JDO 2.1* : https://sourceforge.net/projects/jpox/[JPOX 1.2]
-* *JDO 2.2* :
-http://www.datanucleus.org/products/accessplatform.html[DataNucleus
-AccessPlatform 1.0.1]
-* *JDO 3.0* :
-http://www.datanucleus.org/products/accessplatform_2_1/index.html[DataNucleus
-AccessPlatform 2.1.0]
-* *JDO 3.1* :
-http://www.datanucleus.org/products/accessplatform_3_2/index.html[DataNucleus
-AccessPlatform 3.2.0]
-
-{empty} +
-
-
-=== Implementationsanchor:Implementations[]
-
-Below is a list of known implementations of JDO, showing the level of
-JDO that the implementation tries to implement, and the type of
-datastore that the implementation supports. You should check the vendors
-website for details of whether the implementation is fully compliant
-with the specification claimed - Apache JDO simply provides visibility
-of known implementations.
-
-[cols=",,,",options="header",]
-|===
-|Name |License |JDO Spec |Datastore(s)
-|http://www.datanucleus.org[DataNucleus Access Platform] |NonCommercial
-|1.0, 2.0, 2.1, 2.2, 3.0, 3.1 |RDBMS, db4o, NeoDatis, LDAP, Excel XLS,
-Excel OOXML, ODF, XML, JSON, Google BigTable, HBase, Amazon S3, MongoDB,
-GoogleStorage, Cassandra, OrientDB, Salesforce.com, Neo4j
-
-|http://www.jdoinstruments.org/[JDOInstruments] |NonCommercial |1.0
-|JDOInstruments
-
-|http://www.jpox.org[_JPOX_] |NonCommercial |1.0, 2.0, 2.1 |RDBMS, db4o
-
-|http://www.bea.com/kodo[_Kodo_] |Commercial |1.0, 2.0 |RDBMS, XML
-
-|http://www.objectdb.com/[ObjectDB for Java/JDO] |Commercial |1.0, 2.0
-|ObjectDB
-
-|http://www.objectivity.com/pages/object-database-solutions/java-data-objects.asp[Objectivity]
-|Commercial |1.0 |ObjectivityDB
-
-|http://www.orientechnologies.com/cms/[Orient] |Commercial |1.0 |Orient
-
-|http://pejava.tripod.com/index.html[_hywy's PE:J_] |Commercial |1.0
-|RDBMS
-
-|http://www.signsoft.de/signsoft/en/intelliBO/[_SignSoft intelliBO_]
-|Commercial |1.0 |intelliBO
-
-|http://speedo.objectweb.org/[_Speedo_] |NonCommercial |1.0 |RDBMS
-
-|http://tjdo.sourceforge.net/[_TJDO_] |NonCommercial |1.0 |RDBMS
-
-|http://www.versant.com/en_US/products/objectdatabase/[Versant]
-|Commercial |1.0, 2.0 |Versant Object Database
-
-|http://www.xcalia.com/xdn/specs/jdo[Xcalia] |Commercial |1.0, 2.0
-|RDBMS, XML, Versant ODBMS, Jalisto, Web services, mainframe
-transactions and screens (CICS, IMS...), packaged applications (ERP,
-CRM,SFA...), components (EJB...).
-|===
-
-'''''
-
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/docs/impls.html b/docs/impls.html
index d8c386a..17218f1 100644
--- a/docs/impls.html
+++ b/docs/impls.html
@@ -11,9 +11,9 @@
<meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
<meta name="description" content="Apache JDO - Java Data Objects"/>
- <title>JDO TEST</title>
+ <title>JDO Implementations<a id="JDO_Implementations"></a></title>
- <link rel="icon" type="image/png" href="https://tzaeschke.github.io/test-jdo-asciidoc/images/JDO_32x32.png"/>
+ <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
<!--
Apache JDO Documentation Template
@@ -280,38 +280,30 @@ table.CodeRay td.code>pre{padding:0}
<div class="row-fluid">
<div class="col-sm-9">
<div class="page-title">
- <h1>JDO TEST</h1>
+ <h1>JDO Implementations<a id="JDO_Implementations"></a></h1>
</div>
<div id="doc-content">
- <div id="index" class="imageblock" style="text-align: center">
-<div class="content">
-<img src="images/JDOx150.png" alt="JDOx150">
-</div>
-</div>
-<div class="imageblock" style="text-align: center">
-<div class="content">
-<img src="images/jdo_text.png" alt="jdo text">
-</div>
+ <div id="index" class="paragraph">
+<p><span class="image" style="float: left"><img src="images/JDOx150.png" alt="JDOx150"></span>
+<span class="image" style="float: left"><img src="images/jdo_text.png" alt="jdo text"></span></p>
</div>
+<hr>
<div class="sect1">
-<h2 id="_jdo_test">JDO TEST</h2>
+<h2 id="_jdo_implementations_a_id_jdo_implementations_a">JDO Implementations<a id="JDO_Implementations"></a></h2>
<div class="sectionbody">
-<hr>
-<div class="sect2">
-<h3 id="_jdo_implementations_a_id_jdo_implementations_a">JDO Implementations<a id="JDO_Implementations"></a></h3>
<div class="paragraph">
<p>To build and run your JDO application, you need a JDO implementation.
This page lists commercial and non-commercial JDO implementations. For
information on how vendors certify compliance with the JDO
-specifications, see <a href="tck.adoc">TCK</a>.</p>
+specifications, see <a href="tck.html">TCK</a>.</p>
</div>
-<div class="sect3">
-<h4 id="_jdo_reference_implementations_a_id_jdo_reference_implementations_a">JDO Reference Implementations<a id="JDO_Reference_Implementations"></a></h4>
+<div class="sect2">
+<h3 id="_jdo_reference_implementations_a_id_jdo_reference_implementations_a">JDO Reference Implementations<a id="JDO_Reference_Implementations"></a></h3>
<div class="ulist">
<ul>
<li>
<p><strong>JDO 1.0</strong> :
-<a href="http://jcp.org/aboutJava/communityprocess/final/jsr012/index2.adoc">FOStore</a></p>
+<a href="http://jcp.org/aboutJava/communityprocess/final/jsr012/index2.html">FOStore</a></p>
</li>
<li>
<p><strong>JDO 2.0</strong> : <a href="https://sourceforge.net/projects/jpox/">JPOX 1.1</a></p>
@@ -321,17 +313,17 @@ specifications, see <a href="tck.adoc">TCK</a>.</p>
</li>
<li>
<p><strong>JDO 2.2</strong> :
-<a href="http://www.datanucleus.org/products/accessplatform.adoc">DataNucleus
+<a href="http://www.datanucleus.org/products/accessplatform.html">DataNucleus
AccessPlatform 1.0.1</a></p>
</li>
<li>
<p><strong>JDO 3.0</strong> :
-<a href="http://www.datanucleus.org/products/accessplatform_2_1/index.adoc">DataNucleus
+<a href="http://www.datanucleus.org/products/accessplatform_2_1/index.html">DataNucleus
AccessPlatform 2.1.0</a></p>
</li>
<li>
<p><strong>JDO 3.1</strong> :
-<a href="http://www.datanucleus.org/products/accessplatform_3_2/index.adoc">DataNucleus
+<a href="http://www.datanucleus.org/products/accessplatform_3_2/index.html">DataNucleus
AccessPlatform 3.2.0</a></p>
</li>
</ul>
@@ -340,8 +332,8 @@ AccessPlatform 3.2.0</a></p>
<p><br></p>
</div>
</div>
-<div class="sect3">
-<h4 id="_implementations_a_id_implementations_a">Implementations<a id="Implementations"></a></h4>
+<div class="sect2">
+<h3 id="_implementations_a_id_implementations_a">Implementations<a id="Implementations"></a></h3>
<div class="paragraph">
<p>Below is a list of known implementations of JDO, showing the level of
JDO that the implementation tries to implement, and the type of
@@ -411,7 +403,7 @@ GoogleStorage, Cassandra, OrientDB, Salesforce.com, Neo4j</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">Orient</p></td>
</tr>
<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://pejava.tripod.com/index.adoc"><em>hywy’s PE:J</em></a></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://pejava.tripod.com/index.html"><em>hywy’s PE:J</em></a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">Commercial</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">1.0</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">RDBMS</p></td>
@@ -457,7 +449,6 @@ CRM,SFA…​), components (EJB…​).</p></td>
<hr>
</div>
</div>
-</div>
</div>
</div>
</div>
diff --git a/docs/index.adoc b/docs/index.adoc
deleted file mode 100644
index 65c8a79..0000000
--- a/docs/index.adoc
+++ /dev/null
@@ -1,173 +0,0 @@
-[[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
-
-'''''
-
-:_basedir:
-:_imagesdir: images/
-:notoc:
-:titlepage:
-:grid: cols
-
-== About Apache JDOanchor:About_Apache_JDO[]
-
-Welcome to Apache JDO, a project of the http://db.apache.org/[Apache DB
-project]. Our goal is a thriving community of users and developers of
-object persistence technology.
-
-Java Data Objects (JDO) is a standard way to access persistent data in
-databases, using plain old Java objects (POJO) to represent persistent
-data. The approach separates data manipulation (done by accessing Java
-data members in the Java domain objects) from database manipulation
-(done by calling the JDO interface methods). This separation of concerns
-leads to a high degree of independence of the Java view of data from the
-database view of the data.
-
-Interfaces are defined for the user's view of persistence:
-
-* PersistenceManager: the component responsible for the life cycle of
-persistent instances, Query factory, and Transaction access
-* Query: the component responsible for querying the datastore and
-returning persistent instances or values
-* Transaction: the component responsible for initiating and completing
-transactions
-
-JDO is being developed as a Java Specification Request in the Java
-Community Process. The original JDO 1.0 is
-http://www.jcp.org/en/jsr/detail?id=12[JSR-12] and the current JDO 3.0.1
-is http://www.jcp.org/en/jsr/detail?id=243[JSR-243].
-
-The Apache JDO project is focused on building the JDO API and the TCK
-for compatibility testing of JDO implementations. Commercial and open
-source implementations of JDO are available for relational databases,
-object databases, and file systems. If you need an implementation for
-building a JDO application, see
-http://db.apache.org/jdo/impls.html[Implementations].
-
-== JDO Newsanchor:JDO_News[]
-
-*JDO 3.1 is released* +
-
-____
-JDO 3.1 has been released. This release contains minor bug fixes. For a
-complete list of changes (features plus bug fixes) see
-https://issues.apache.org/jira/browse/JDO/fixforversion/12325878[JDO 3.1
-changes]. You can download the release from the
-http://db.apache.org/jdo/downloads.html[downloads page]. You can also
-use the new release in maven projects simply by referencing the jdo-api
-artifact in your pom.xml.
-____
-
-*JDO 3.1-rc1 is released* +
-
-____
-JDO 3.1-rc1 has been released. This release contains minor bug fixes.
-For a complete list of changes (features plus bug fixes) see
-https://issues.apache.org/jira/browse/JDO/fixforversion/12314921[JDO
-3.1-rc1 changes]. You can download the release from the
-http://db.apache.org/jdo/downloads.html[downloads page]. You can also
-use the new release in maven projects simply by referencing the jdo-api
-artifact in your pom.xml.
-____
-
-*JDO 3.0.1 is released* +
-
-____
-JDO 3.0.1 has been released. This release contains minor bug fixes. For
-a complete list of changes (features plus bug fixes) see
-https://issues.apache.org/jira/browse/JDO/fixforversion/12317950[JDO
-3.0.1 changes]. You can download the release from the
-http://db.apache.org/jdo/downloads.html[downloads page]. You can also
-use the new release in maven projects simply by referencing the jdo-api
-artifact in your pom.xml.
-____
-
-*JDO 3.0 is released* +
-
-____
-JDO 3.0 has been released. This release contains significant new
-features for better support of tooling and runtime: enhancer API,
-dynamic class and metadata generation, locking, database timeouts, query
-cancel, and exact object ids. For a complete list of changes (features
-plus bug fixes) see
-https://issues.apache.org/jira/browse/JDO/fixforversion/12313404[JDO 3.0
-changes]. You can download the release from the
-http://db.apache.org/jdo/downloads.html[downloads page]. You can also
-use the new release in maven projects simply by referencing the jdo-api
-artifact in your pom.xml.
-____
-
-*JDO 2.2 is released* +
-
-____
-JDO 2.2 is now available for download from the
-http://db.apache.org/jdo/downloads.html[downloads page]. The JDO 2.2
-maintenance release provides support for copyOnAttach control, dynamic
-fetch groups, level2 caching control via metadata. For details, see
-http://jcp.org/aboutJava/communityprocess/maintenance/jsr243/243MR2.html[ChangeLog
-for JSR-0243 JavaTM Data Objects 2.2]
-____
-
-*JDO 2.1.1 is released* +
-
-____
-JDO 2.1.1 is now available for download from the
-http://db.apache.org/jdo/downloads.html[downloads page]. This is a minor
-bug fix release.
-____
-
-*JDO 2.1 is released* +
-
-____
-JDO 2.1 is now available for download from the
-http://db.apache.org/jdo/downloads.html[downloads page]. The JDO 2.1
-maintenance release provides support for JDK 1.5 features,including the
-use of annotations as a means of specifying mapping. It also includes
-many corrections and minor changes. For details, see
-http://jcp.org/aboutJava/communityprocess/maintenance/jsr243/243ChangeLog.html[Change
-Log for JSR-000243 JavaTM Data Objects 2.0] (_2007-08-02_)
-____
-
-*JDO 2.0 has been approved by the JCP* +
-
-____
-JDO 2.0 is now available for download from the
-http://db.apache.org/jdo/downloads.html[downloads page]. JDO 2.0 builds
-on JDO 1 and includes many features requested by users:
-
-* Standard mapping from objects to relational databases
-* Multi-tier support without use of Data Transfer Objects
-* Improved query support including projections and aggregates
-* Stored queries in metadata
-* Deletion by query
-* Optimized fetching of object graphs without writing special queries
-* Extensive List and Map support
-* Lazy loading of large collections
-* Improved support for single-field primary keys
-* Object lifecycle event monitoring
-* Improved support for bidirectional relationships
-
-(_2006-05-03_)
-____
-
-*Java Community Process!* +
-JDO is being developed under the Java Community Process. The Apache JDO
-project is developing the API and the Technology Compatibility Kit for
-the JDO standard. (_2005-07-13_)
-
-*Users!* +
-We'd love to have you involved. Check out the
-http://wiki.apache.org/jdo[Wiki]. Check out the
-http://www.jcp.org/en/jsr/detail?id=243[Specification], which has been
-approved. http://db.apache.org/jdo/get-involved.html[Get Involved]!
-(_2005-07-13_)
-
-_Archived articles are http://db.apache.org/jdo/newshistory.html[here]_.
-
-'''''
-
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/docs/index.html b/docs/index.html
index c106357..e1d32a6 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -11,9 +11,9 @@
<meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
<meta name="description" content="Apache JDO - Java Data Objects"/>
- <title>JDO TEST</title>
+ <title>About Apache JDO<a id="About_Apache_JDO"></a></title>
- <link rel="icon" type="image/png" href="https://tzaeschke.github.io/test-jdo-asciidoc/images/JDO_32x32.png"/>
+ <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
<!--
Apache JDO Documentation Template
@@ -280,25 +280,17 @@ table.CodeRay td.code>pre{padding:0}
<div class="row-fluid">
<div class="col-sm-9">
<div class="page-title">
- <h1>JDO TEST</h1>
+ <h1>About Apache JDO<a id="About_Apache_JDO"></a></h1>
</div>
<div id="doc-content">
- <div id="index" class="imageblock" style="text-align: center">
-<div class="content">
-<img src="images/JDOx150.png" alt="JDOx150">
-</div>
-</div>
-<div class="imageblock" style="text-align: center">
-<div class="content">
-<img src="images/jdo_text.png" alt="jdo text">
-</div>
+ <div id="index" class="paragraph">
+<p><span class="image" style="float: left"><img src="images/JDOx150.png" alt="JDOx150"></span>
+<span class="image" style="float: left"><img src="images/jdo_text.png" alt="jdo text"></span></p>
</div>
+<hr>
<div class="sect1">
-<h2 id="_jdo_test">JDO TEST</h2>
+<h2 id="_about_apache_jdo_a_id_about_apache_jdo_a">About Apache JDO<a id="About_Apache_JDO"></a></h2>
<div class="sectionbody">
-<hr>
-<div class="sect2">
-<h3 id="_about_apache_jdo_a_id_about_apache_jdo_a">About Apache JDO<a id="About_Apache_JDO"></a></h3>
<div class="paragraph">
<p>Welcome to Apache JDO, a project of the <a href="http://db.apache.org/">Apache DB
project</a>. Our goal is a thriving community of users and developers of
@@ -343,11 +335,14 @@ is <a href="http://www.jcp.org/en/jsr/detail?id=243">JSR-243</a>.</p>
for compatibility testing of JDO implementations. Commercial and open
source implementations of JDO are available for relational databases,
object databases, and file systems. If you need an implementation for
-building a JDO application, see <a href="impls.adoc">Implementations</a>.</p>
+building a JDO application, see
+<a href="http://db.apache.org/jdo/impls.html">Implementations</a>.</p>
</div>
</div>
-<div class="sect2">
-<h3 id="_jdo_news_a_id_jdo_news_a">JDO News<a id="JDO_News"></a></h3>
+</div>
+<div class="sect1">
+<h2 id="_jdo_news_a_id_jdo_news_a">JDO News<a id="JDO_News"></a></h2>
+<div class="sectionbody">
<div class="paragraph">
<p><strong>JDO 3.1 is released</strong><br></p>
</div>
@@ -358,9 +353,9 @@ building a JDO application, see <a href="impls.adoc">Implementations</a>.</p>
complete list of changes (features plus bug fixes) see
<a href="https://issues.apache.org/jira/browse/JDO/fixforversion/12325878">JDO 3.1
changes</a>. You can download the release from the
-<a href="downloads.adoc">downloads page</a>. You can also use the new release in
-maven projects simply by referencing the jdo-api artifact in your
-pom.xml.</p>
+<a href="http://db.apache.org/jdo/downloads.html">downloads page</a>. You can also
+use the new release in maven projects simply by referencing the jdo-api
+artifact in your pom.xml.</p>
</div>
</blockquote>
</div>
@@ -374,9 +369,9 @@ pom.xml.</p>
For a complete list of changes (features plus bug fixes) see
<a href="https://issues.apache.org/jira/browse/JDO/fixforversion/12314921">JDO
3.1-rc1 changes</a>. You can download the release from the
-<a href="downloads.adoc">downloads page</a>. You can also use the new release in
-maven projects simply by referencing the jdo-api artifact in your
-pom.xml.</p>
+<a href="http://db.apache.org/jdo/downloads.html">downloads page</a>. You can also
+use the new release in maven projects simply by referencing the jdo-api
+artifact in your pom.xml.</p>
</div>
</blockquote>
</div>
@@ -390,9 +385,9 @@ pom.xml.</p>
a complete list of changes (features plus bug fixes) see
<a href="https://issues.apache.org/jira/browse/JDO/fixforversion/12317950">JDO
3.0.1 changes</a>. You can download the release from the
-<a href="downloads.adoc">downloads page</a>. You can also use the new release in
-maven projects simply by referencing the jdo-api artifact in your
-pom.xml.</p>
+<a href="http://db.apache.org/jdo/downloads.html">downloads page</a>. You can also
+use the new release in maven projects simply by referencing the jdo-api
+artifact in your pom.xml.</p>
</div>
</blockquote>
</div>
@@ -409,9 +404,9 @@ cancel, and exact object ids. For a complete list of changes (features
plus bug fixes) see
<a href="https://issues.apache.org/jira/browse/JDO/fixforversion/12313404">JDO 3.0
changes</a>. You can download the release from the
-<a href="downloads.adoc">downloads page</a>. You can also use the new release in
-maven projects simply by referencing the jdo-api artifact in your
-pom.xml.</p>
+<a href="http://db.apache.org/jdo/downloads.html">downloads page</a>. You can also
+use the new release in maven projects simply by referencing the jdo-api
+artifact in your pom.xml.</p>
</div>
</blockquote>
</div>
@@ -422,10 +417,10 @@ pom.xml.</p>
<blockquote>
<div class="paragraph">
<p>JDO 2.2 is now available for download from the
-<a href="downloads.adoc">downloads page</a>. The JDO 2.2 maintenance release
-provides support for copyOnAttach control, dynamic fetch groups, level2
-caching control via metadata. For details, see
-<a href="http://jcp.org/aboutJava/communityprocess/maintenance/jsr243/243MR2.adoc">ChangeLog
+<a href="http://db.apache.org/jdo/downloads.html">downloads page</a>. The JDO 2.2
+maintenance release provides support for copyOnAttach control, dynamic
+fetch groups, level2 caching control via metadata. For details, see
+<a href="http://jcp.org/aboutJava/communityprocess/maintenance/jsr243/243MR2.html">ChangeLog
for JSR-0243 JavaTM Data Objects 2.2</a></p>
</div>
</blockquote>
@@ -437,7 +432,8 @@ for JSR-0243 JavaTM Data Objects 2.2</a></p>
<blockquote>
<div class="paragraph">
<p>JDO 2.1.1 is now available for download from the
-<a href="downloads.adoc">downloads page</a>. This is a minor bug fix release.</p>
+<a href="http://db.apache.org/jdo/downloads.html">downloads page</a>. This is a minor
+bug fix release.</p>
</div>
</blockquote>
</div>
@@ -448,11 +444,11 @@ for JSR-0243 JavaTM Data Objects 2.2</a></p>
<blockquote>
<div class="paragraph">
<p>JDO 2.1 is now available for download from the
-<a href="downloads.adoc">downloads page</a>. The JDO 2.1 maintenance release
-provides support for JDK 1.5 features,including the use of annotations
-as a means of specifying mapping. It also includes many corrections and
-minor changes. For details, see
-<a href="http://jcp.org/aboutJava/communityprocess/maintenance/jsr243/243ChangeLog.adoc">Change
+<a href="http://db.apache.org/jdo/downloads.html">downloads page</a>. The JDO 2.1
+maintenance release provides support for JDK 1.5 features,including the
+use of annotations as a means of specifying mapping. It also includes
+many corrections and minor changes. For details, see
+<a href="http://jcp.org/aboutJava/communityprocess/maintenance/jsr243/243ChangeLog.html">Change
Log for JSR-000243 JavaTM Data Objects 2.0</a> (<em>2007-08-02</em>)</p>
</div>
</blockquote>
@@ -464,8 +460,8 @@ Log for JSR-000243 JavaTM Data Objects 2.0</a> (<em>2007-08-02</em>)</p>
<blockquote>
<div class="paragraph">
<p>JDO 2.0 is now available for download from the
-<a href="downloads.adoc">downloads page</a>. JDO 2.0 builds on JDO 1 and
-includes many features requested by users:</p>
+<a href="http://db.apache.org/jdo/downloads.html">downloads page</a>. JDO 2.0 builds
+on JDO 1 and includes many features requested by users:</p>
</div>
<div class="ulist">
<ul>
@@ -520,10 +516,11 @@ the JDO standard. (<em>2005-07-13</em>)</p>
We’d love to have you involved. Check out the
<a href="http://wiki.apache.org/jdo">Wiki</a>. Check out the
<a href="http://www.jcp.org/en/jsr/detail?id=243">Specification</a>, which has been
-approved. <a href="./get-involved.adoc">Get Involved</a>! (<em>2005-07-13</em>)</p>
+approved. <a href="http://db.apache.org/jdo/get-involved.html">Get Involved</a>!
+(<em>2005-07-13</em>)</p>
</div>
<div class="paragraph">
-<p><em>Archived articles are <a href="newshistory.adoc">here</a></em>.</p>
+<p><em>Archived articles are <a href="http://db.apache.org/jdo/newshistory.html">here</a></em>.</p>
</div>
<hr>
<div id="footer" class="paragraph">
@@ -531,7 +528,6 @@ approved. <a href="./get-involved.adoc">Get Involved</a>! (<em>2005-07-13</em>)<
</div>
<hr>
</div>
-</div>
</div>
</div>
</div>
diff --git a/docs/issue-tracking.adoc b/docs/issue-tracking.adoc
deleted file mode 100644
index 6d82849..0000000
--- a/docs/issue-tracking.adoc
+++ /dev/null
@@ -1,13 +0,0 @@
-[[index]]
-image::images/JDOx150.png[align="center"]
-image::images/jdo_text.png[align="center"]
-== JDO TEST
-
-'''''
-
-:_basedir:
-:_imagesdir: images/
-:notoc:
-:titlepage:
-:grid: cols
-
diff --git a/docs/issue-tracking.html b/docs/issue-tracking.html
index 28ce369..46cb08d 100644
--- a/docs/issue-tracking.html
+++ b/docs/issue-tracking.html
@@ -13,7 +13,7 @@
<title>JDO TEST</title>
- <link rel="icon" type="image/png" href="https://tzaeschke.github.io/test-jdo-asciidoc/images/JDO_32x32.png"/>
+ <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
<!--
Apache JDO Documentation Template
diff --git a/docs/issuetracking.adoc b/docs/issuetracking.adoc
deleted file mode 100644
index bc6129f..0000000
--- a/docs/issuetracking.adoc
+++ /dev/null
@@ -1,52 +0,0 @@
-[[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
-
-'''''
-
-:_basedir:
-:_imagesdir: images/
-:notoc:
-:titlepage:
-:grid: cols
-
-== Processanchor:Process[]
-
-The JDO project uses
-http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10630[JIRA]
-to track issues.
-
-We use the following workflow for our JIRA issues:
-
-____
-Open->Resolved(<->Reopened)->Closed
-____
-
-____
-When the engineer has fixed an issue, she sets the issue to resolved.
-The submitter can reopen it if there is some problem with it. When the
-release in which the issue is fixed ships, the issue is set to closed.
-____
-
-____
-If the same issue comes up again after release, another JIRA is opened,
-referring to the original issue. This accommodates fixes being
-backported (if ever necessary) to dot releases after the original
-release ships.
-____
-
-== View Issuesanchor:View_Issues[]
-
-* http://issues.apache.org/jira/browse/JDO?report=com.atlassian.jira.plugin.system.project:openissues-panel[Open
-Issues]
-* http://issues.apache.org/jira/browse/JDO?report=com.atlassian.jira.plugin.system.project:changelog-panel[Change
-Log for released versions]
-* http://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12310830&styleName=Html&projectId=10630&Create=Create[Release
-Notes for released versions]
-
-'''''
-
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/docs/issuetracking.html b/docs/issuetracking.html
index 4074a58..e54ab4c 100644
--- a/docs/issuetracking.html
+++ b/docs/issuetracking.html
@@ -11,9 +11,9 @@
<meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
<meta name="description" content="Apache JDO - Java Data Objects"/>
- <title>JDO TEST</title>
+ <title>Process<a id="Process"></a></title>
- <link rel="icon" type="image/png" href="https://tzaeschke.github.io/test-jdo-asciidoc/images/JDO_32x32.png"/>
+ <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
<!--
Apache JDO Documentation Template
@@ -280,25 +280,17 @@ table.CodeRay td.code>pre{padding:0}
<div class="row-fluid">
<div class="col-sm-9">
<div class="page-title">
- <h1>JDO TEST</h1>
+ <h1>Process<a id="Process"></a></h1>
</div>
<div id="doc-content">
- <div id="index" class="imageblock" style="text-align: center">
-<div class="content">
-<img src="images/JDOx150.png" alt="JDOx150">
-</div>
-</div>
-<div class="imageblock" style="text-align: center">
-<div class="content">
-<img src="images/jdo_text.png" alt="jdo text">
-</div>
+ <div id="index" class="paragraph">
+<p><span class="image" style="float: left"><img src="images/JDOx150.png" alt="JDOx150"></span>
+<span class="image" style="float: left"><img src="images/jdo_text.png" alt="jdo text"></span></p>
</div>
+<hr>
<div class="sect1">
-<h2 id="_jdo_test">JDO TEST</h2>
+<h2 id="_process_a_id_process_a">Process<a id="Process"></a></h2>
<div class="sectionbody">
-<hr>
-<div class="sect2">
-<h3 id="_process_a_id_process_a">Process<a id="Process"></a></h3>
<div class="paragraph">
<p>The JDO project uses
<a href="http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10630">JIRA</a>
@@ -334,8 +326,10 @@ release ships.</p>
</blockquote>
</div>
</div>
-<div class="sect2">
-<h3 id="_view_issues_a_id_view_issues_a">View Issues<a id="View_Issues"></a></h3>
+</div>
+<div class="sect1">
+<h2 id="_view_issues_a_id_view_issues_a">View Issues<a id="View_Issues"></a></h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -358,7 +352,6 @@ Notes for released versions</a></p>
</div>
<hr>
</div>
-</div>
</div>
</div>
</div>
diff --git a/docs/javadoc.adoc b/docs/javadoc.adoc
deleted file mode 100644
index 086d9ed..0000000
--- a/docs/javadoc.adoc
+++ /dev/null
@@ -1,80 +0,0 @@
-[[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
-
-'''''
-
-:_basedir:
-:_imagesdir: images/
-:notoc:
-:titlepage:
-:grid: cols
-
-== Javadoc Formatsanchor:Javadoc_Formats[]
-
-JDO Javadoc is available in two formats. You can browse the javadoc
-online, or you can download it as a .zip file and unzip it to a local
-directory.
-
-== JDO 3.1 javadocanchor:JDO_3.1_javadoc[]
-
-JDO 3.1 is the current release of the Apache JDO implementation of
-JSR-243.
-
-link:api31/jdo-api-3.1-javadoc/index.html[Browse JDO 3.1 javadoc online]
-
-link:api31/jdo-api-3.1-javadoc.zip[Download JDO 3.1 javadoc]
-
-== JDO 3.0 javadocanchor:JDO_3.0_javadoc[]
-
-JDO 3.0 is the Apache JDO implementation of JSR-243.
-
-link:api30/apidocs/index.html[Browse JDO 3.0 javadoc online]
-
-link:api30/apidocs.zip[Download JDO 3.0 javadoc]
-
-== JDO 2.2 javadocanchor:JDO_2.2_javadoc[]
-
-JDO 2.2 is the Maintenance Release 2 of the Apache JDO implementation of
-JSR-243.
-
-link:api22/apidocs/index.html[Browse JDO 2.2 javadoc online]
-
-link:api22/apidocs.zip[Download JDO 2.2 javadoc]
-
-== JDO 2.1 javadocanchor:JDO_2.1_javadoc[]
-
-JDO 2.1 is the Maintenance Release 1 of the Apache JDO implementation of
-JSR-243.
-
-link:api21/apidocs/index.html[Browse JDO 2.1 javadoc online]
-
-link:api21/apidocs.zip[Download JDO 2.1 javadoc]
-
-link:api21-legacy/apidocs/index.html[Browse JDO 2.1-legacy javadoc
-online]
-
-link:api21-legacy/apidocs.zip[Download JDO 2.1-legacy javadoc]
-
-== JDO 2.0 javadocanchor:JDO_2.0_javadoc[]
-
-JDO 2.0 is the Apache JDO implementation of JSR-243.
-
-link:api20/apidocs/index.html[Browse JDO 2.0 javadoc online]
-
-link:api20/apidocs.zip[Download JDO 2.0 javadoc]
-
-== JDO 1.1 javadocanchor:JDO_1.1_javadoc[]
-
-JDO 1.1 is the Apache JDO implementation of JSR-12.
-
-link:api11/apidocs/index.html[Browse JDO 1.1 javadoc online]
-
-link:api11/apidocs.zip[Download JDO 1.1 javadoc]
-
-'''''
-
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/docs/javadoc.html b/docs/javadoc.html
index adbda99..0bec0a3 100644
--- a/docs/javadoc.html
+++ b/docs/javadoc.html
@@ -11,9 +11,9 @@
<meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
<meta name="description" content="Apache JDO - Java Data Objects"/>
- <title>JDO TEST</title>
+ <title>Javadoc Formats<a id="Javadoc_Formats"></a></title>
- <link rel="icon" type="image/png" href="https://tzaeschke.github.io/test-jdo-asciidoc/images/JDO_32x32.png"/>
+ <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
<!--
Apache JDO Documentation Template
@@ -280,108 +280,112 @@ table.CodeRay td.code>pre{padding:0}
<div class="row-fluid">
<div class="col-sm-9">
<div class="page-title">
- <h1>JDO TEST</h1>
+ <h1>Javadoc Formats<a id="Javadoc_Formats"></a></h1>
</div>
<div id="doc-content">
- <div id="index" class="imageblock" style="text-align: center">
-<div class="content">
-<img src="images/JDOx150.png" alt="JDOx150">
-</div>
-</div>
-<div class="imageblock" style="text-align: center">
-<div class="content">
-<img src="images/jdo_text.png" alt="jdo text">
-</div>
+ <div id="index" class="paragraph">
+<p><span class="image" style="float: left"><img src="images/JDOx150.png" alt="JDOx150"></span>
+<span class="image" style="float: left"><img src="images/jdo_text.png" alt="jdo text"></span></p>
</div>
+<hr>
<div class="sect1">
-<h2 id="_jdo_test">JDO TEST</h2>
+<h2 id="_javadoc_formats_a_id_javadoc_formats_a">Javadoc Formats<a id="Javadoc_Formats"></a></h2>
<div class="sectionbody">
-<hr>
-<div class="sect2">
-<h3 id="_javadoc_formats_a_id_javadoc_formats_a">Javadoc Formats<a id="Javadoc_Formats"></a></h3>
<div class="paragraph">
<p>JDO Javadoc is available in two formats. You can browse the javadoc
online, or you can download it as a .zip file and unzip it to a local
directory.</p>
</div>
</div>
-<div class="sect2">
-<h3 id="_jdo_3_1_javadoc_a_id_jdo_3_1_javadoc_a">JDO 3.1 javadoc<a id="JDO_3.1_javadoc"></a></h3>
+</div>
+<div class="sect1">
+<h2 id="_jdo_3_1_javadoc_a_id_jdo_3_1_javadoc_a">JDO 3.1 javadoc<a id="JDO_3.1_javadoc"></a></h2>
+<div class="sectionbody">
<div class="paragraph">
<p>JDO 3.1 is the current release of the Apache JDO implementation of
JSR-243.</p>
</div>
<div class="paragraph">
-<p><a href="api31/jdo-api-3.1-javadoc/index.adoc">Browse JDO 3.1 javadoc online</a></p>
+<p><a href="api31/jdo-api-3.1-javadoc/index.html">Browse JDO 3.1 javadoc online</a></p>
</div>
<div class="paragraph">
<p><a href="api31/jdo-api-3.1-javadoc.zip">Download JDO 3.1 javadoc</a></p>
</div>
</div>
-<div class="sect2">
-<h3 id="_jdo_3_0_javadoc_a_id_jdo_3_0_javadoc_a">JDO 3.0 javadoc<a id="JDO_3.0_javadoc"></a></h3>
+</div>
+<div class="sect1">
+<h2 id="_jdo_3_0_javadoc_a_id_jdo_3_0_javadoc_a">JDO 3.0 javadoc<a id="JDO_3.0_javadoc"></a></h2>
+<div class="sectionbody">
<div class="paragraph">
<p>JDO 3.0 is the Apache JDO implementation of JSR-243.</p>
</div>
<div class="paragraph">
-<p><a href="api30/apidocs/index.adoc">Browse JDO 3.0 javadoc online</a></p>
+<p><a href="api30/apidocs/index.html">Browse JDO 3.0 javadoc online</a></p>
</div>
<div class="paragraph">
<p><a href="api30/apidocs.zip">Download JDO 3.0 javadoc</a></p>
</div>
</div>
-<div class="sect2">
-<h3 id="_jdo_2_2_javadoc_a_id_jdo_2_2_javadoc_a">JDO 2.2 javadoc<a id="JDO_2.2_javadoc"></a></h3>
+</div>
+<div class="sect1">
+<h2 id="_jdo_2_2_javadoc_a_id_jdo_2_2_javadoc_a">JDO 2.2 javadoc<a id="JDO_2.2_javadoc"></a></h2>
+<div class="sectionbody">
<div class="paragraph">
<p>JDO 2.2 is the Maintenance Release 2 of the Apache JDO implementation of
JSR-243.</p>
</div>
<div class="paragraph">
-<p><a href="api22/apidocs/index.adoc">Browse JDO 2.2 javadoc online</a></p>
+<p><a href="api22/apidocs/index.html">Browse JDO 2.2 javadoc online</a></p>
</div>
<div class="paragraph">
<p><a href="api22/apidocs.zip">Download JDO 2.2 javadoc</a></p>
</div>
</div>
-<div class="sect2">
-<h3 id="_jdo_2_1_javadoc_a_id_jdo_2_1_javadoc_a">JDO 2.1 javadoc<a id="JDO_2.1_javadoc"></a></h3>
+</div>
+<div class="sect1">
+<h2 id="_jdo_2_1_javadoc_a_id_jdo_2_1_javadoc_a">JDO 2.1 javadoc<a id="JDO_2.1_javadoc"></a></h2>
+<div class="sectionbody">
<div class="paragraph">
<p>JDO 2.1 is the Maintenance Release 1 of the Apache JDO implementation of
JSR-243.</p>
</div>
<div class="paragraph">
-<p><a href="api21/apidocs/index.adoc">Browse JDO 2.1 javadoc online</a></p>
+<p><a href="api21/apidocs/index.html">Browse JDO 2.1 javadoc online</a></p>
</div>
<div class="paragraph">
<p><a href="api21/apidocs.zip">Download JDO 2.1 javadoc</a></p>
</div>
<div class="paragraph">
-<p><a href="api21-legacy/apidocs/index.adoc">Browse JDO 2.1-legacy javadoc
+<p><a href="api21-legacy/apidocs/index.html">Browse JDO 2.1-legacy javadoc
online</a></p>
</div>
<div class="paragraph">
<p><a href="api21-legacy/apidocs.zip">Download JDO 2.1-legacy javadoc</a></p>
</div>
</div>
-<div class="sect2">
-<h3 id="_jdo_2_0_javadoc_a_id_jdo_2_0_javadoc_a">JDO 2.0 javadoc<a id="JDO_2.0_javadoc"></a></h3>
+</div>
+<div class="sect1">
+<h2 id="_jdo_2_0_javadoc_a_id_jdo_2_0_javadoc_a">JDO 2.0 javadoc<a id="JDO_2.0_javadoc"></a></h2>
+<div class="sectionbody">
<div class="paragraph">
<p>JDO 2.0 is the Apache JDO implementation of JSR-243.</p>
</div>
<div class="paragraph">
-<p><a href="api20/apidocs/index.adoc">Browse JDO 2.0 javadoc online</a></p>
+<p><a href="api20/apidocs/index.html">Browse JDO 2.0 javadoc online</a></p>
</div>
<div class="paragraph">
<p><a href="api20/apidocs.zip">Download JDO 2.0 javadoc</a></p>
</div>
</div>
-<div class="sect2">
-<h3 id="_jdo_1_1_javadoc_a_id_jdo_1_1_javadoc_a">JDO 1.1 javadoc<a id="JDO_1.1_javadoc"></a></h3>
+</div>
+<div class="sect1">
+<h2 id="_jdo_1_1_javadoc_a_id_jdo_1_1_javadoc_a">JDO 1.1 javadoc<a id="JDO_1.1_javadoc"></a></h2>
+<div class="sectionbody">
<div class="paragraph">
<p>JDO 1.1 is the Apache JDO implementation of JSR-12.</p>
</div>
<div class="paragraph">
-<p><a href="api11/apidocs/index.adoc">Browse JDO 1.1 javadoc online</a></p>
+<p><a href="api11/apidocs/index.html">Browse JDO 1.1 javadoc online</a></p>
</div>
<div class="paragraph">
<p><a href="api11/apidocs.zip">Download JDO 1.1 javadoc</a></p>
@@ -392,7 +396,6 @@ online</a></p>
</div>
<hr>
</div>
-</div>
</div>
</div>
</div>
diff --git a/docs/jdo_3_0_overview.adoc b/docs/jdo_3_0_overview.adoc
deleted file mode 100644
index e3b4145..0000000
--- a/docs/jdo_3_0_overview.adoc
+++ /dev/null
@@ -1,205 +0,0 @@
-[[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
-
-'''''
-
-:_basedir:
-:_imagesdir: images/
-:notoc:
-:titlepage:
-:grid: cols
-
-== JDO 3.0 Overviewanchor:JDO_3.0_Overview[]
-
-=== Backgroundanchor:Background[]
-
-Java Data Objects (JDO) is a specification begun in 2000, with 2 major
-releases JDO1 (2002 under JSR0012) and JDO2 (2006 under JSR0243). It was
-placed under Apache in 2005 and is the rare example of a specification
-that has undergone continual improvement during its lifetime, for the
-last 4 years being developed totally in the open, accepting input from
-everyone.
-
-JDO 3.0 was started in October 2008, and encompasses additions to the
-specification in the areas of a metadata API, an enhancer API, addition
-of cancel/timeout control to queries, and addition of control to the
-locking of objects when read.
-
-=== Metadata APIanchor:Metadata_API[]
-
-To persist Java objects you need to specify which classes are
-persistable, and how they are persisted. This was traditionally handled
-using XML configuration. With the advent of JDK1.5, annotations were
-added as another possible way of defining such information. JDO 3.0
-takes this further and provides a *Metadata API*, allowing runtime
-definition. This is of particular use for systems that don't know at
-application startup which classes should be persistable, maybe because
-the class hasn't been written yet.
-
-To demonstrate the Metadata API, lets assume that we have a
-PersistenceManagerFactory created for our datastore. So we request a new
-Metadata object.
-
-....
-PersistenceManagerFactory pmf = JDOHelper.getPersistenceManagerFactory(props);
-JDOMetaData jdomd = pmf.newMetadata();
-....
-
-So we can now start defining the metadata for the package/class(es) we
-want to persist. The Metadata is structured in a similar way to the XML
-DTD/XSD. So let's add a class
-
-....
-ClassMetadata cmd = jdomd.newClassMetadata("test.Client");
-cmd.setTable("CLIENT").setDetachable(true).setIdentityType(javax.jdo.annotations.IdentityType.DATASTORE);
-cmd.setPersistenceModifier(javax.jdo.metadata.ClassPersistenceModifier.PERSISTENCE_CAPABLE);
-....
-
-So we have a class _test.Client_ using datastore-identity, that is
-detachable, and is persisted to a table _CLIENT_. As you can see, you
-can chain setters for convenient coding.
-
-....
-InheritanceMetadata inhmd = cmd.newInheritanceMetadata();
-inhmd.setStrategy(javax.jdo.annotations.InheritanceStrategy.NEW_TABLE);
-DiscriminatorMetadata dmd = inhmd.newDiscriminatorMetadata();
-dmd.setColumn("disc").setValue("Client").setStrategy(javax.jdo.annotations.DiscriminatorStrategy.VALUE_MAP);
-dmd.setIndexed(Indexed.TRUE);
-
-VersionMetadata vermd = cmd.newVersionMetadata();
-vermd.setStrategy(javax.jdo.annotations.VersionStrategy.VERSION_NUMBER).setColumn("version");
-vermd.setIndexed(Indexed.TRUE);
-....
-
-So we will use "new-table" inheritance for this class, and it will have
-a discriminator stored in column _disc_ of type "value-map". The class
-will also be versioned, using column _version_, that is indexed. All of
-this was for the class as a whole, so let's look at the
-fields/properties of the class.
-
-....
-FieldMetadata fmd = cmd.newFieldMetadata("name");
-fmd.setNullValue(javax.jdo.annotations.NullValue.DEFAULT).setColumn("name").setIndexed(true).setUnique(true);
-....
-
-So we have a field _name_ that is persisted into column _name_, and is
-unique and indexed. The API metadata components all follow the DTD as
-stated earlier, so if our field was a collection we could then define
-_CollectionMetadata_ below it.
-
-The only thing left to do is register the metadata with the
-PersistenceManagerFactory, like this
-
-....
-pmf.registerMetadata(jdomd);
-....
-
-and any contact with the class will now persist according to this API.
-
-You can similarly browse already registered metadata using
-
-....
-ComponentMetadata compmd = pmf.getMetadata("mydomain.MyClass");
-....
-
-Note that you cannot change already registered metadata with JDO 3.0.
-
-You can view the Javadocs for the Metadata API
-http://db.apache.org/jdo/api30/apidocs/javax/jdo/metadata/package-summary.html[here].
-
-=== Enhancer APIanchor:Enhancer_API[]
-
-JDO implementations typically (but aren't compelled to) include a
-bytecode enhancement step, allowing for efficient change detection of
-objects. While the Metadata API above is very useful, if we just define
-metadata for a class we still need to enhance the class using this
-metadata. This is where the *Enhancer API* comes in. To start we need to
-get a JDOEnhancer
-
-....
-JDOEnhancer enhancer = JDOHelper.getEnhancer();
-....
-
-and now that we have the enhancer and want to enhance our class above so
-we need to register our new metadata with it (generate the metadata as
-shown above)
-
-....
-enhancer.registerMetadata(jdomd);
-....
-
-Now we can handle the enhancement using a separate class loader if
-required (for example if the classes were defined dynamically, e.g by
-ASM)
-
-....
-enhancer.setClassLoader(myClassLoader);
-....
-
-Finally we select what to enhance, and perform the enhancement
-
-....
-String[] classes = {"test.Client"};
-enhancer.addClasses(classes);
-enhancer.enhance();
-....
-
-So the class is now enhanced and is ready for use.
-
-You can view the Javadocs for the Enhancer API
-http://db.apache.org/jdo/api30/apidocs/index.html[here].
-
-=== Query Cancel/Timeout APIanchor:Query_CancelTimeout_API[]
-
-On occasions a query may be inefficient, or may suffer from problems in
-the underlying datastore, and so we don't want to affect the
-application. In this case it would make sense to have control over a
-timeout for the query, or be able to cancel it. JDO 3.0 introduces the
-Query cancel/timeout control, via the following new methods to
-_javax.jdo.Query_
-
-....
-void setTimeoutMillis(Integer interval);
-Integer getTimeoutMillis();
-void cancelAll();
-void cancel(Thread thread);
-....
-
-So we have the ability to cancel a query as required, or just let it
-timeout.
-
-=== Control of read objects lockinganchor:Control_of_read_objects_locking[]
-
-When we are using datastore (pessimistic) transactions it often doesn't
-make sense to just lock all objects read in the transaction. For this
-reason JDO 3.0 introduces control over which objects are locked and
-which aren't.
-
-In metadata for each class you can specify the "serialize-read" setting.
-True will mean that objects of this type will be locked when read.
-
-On a Transaction you can override the metadata settings via the
-following method
-
-....
-void setSerializeRead(Boolean serialize);
-Boolean getSerializeRead();
-....
-
-On a Query you can override the metadata and Transaction settings via
-the following method
-
-....
-void setSerializeRead(Boolean serialize);
-Boolean getSerializeRead();
-....
-
-This concludes our simple overview of JDO3. We hope you enjoy using it
-
-'''''
-
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/docs/jdo_3_0_overview.html b/docs/jdo_3_0_overview.html
index f79b683..630749c 100644
--- a/docs/jdo_3_0_overview.html
+++ b/docs/jdo_3_0_overview.html
@@ -11,9 +11,9 @@
<meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
<meta name="description" content="Apache JDO - Java Data Objects"/>
- <title>JDO TEST</title>
+ <title>JDO 3.0 Overview<a id="JDO_3.0_Overview"></a></title>
- <link rel="icon" type="image/png" href="https://tzaeschke.github.io/test-jdo-asciidoc/images/JDO_32x32.png"/>
+ <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
<!--
Apache JDO Documentation Template
@@ -280,27 +280,19 @@ table.CodeRay td.code>pre{padding:0}
<div class="row-fluid">
<div class="col-sm-9">
<div class="page-title">
- <h1>JDO TEST</h1>
+ <h1>JDO 3.0 Overview<a id="JDO_3.0_Overview"></a></h1>
</div>
<div id="doc-content">
- <div id="index" class="imageblock" style="text-align: center">
-<div class="content">
-<img src="images/JDOx150.png" alt="JDOx150">
-</div>
-</div>
-<div class="imageblock" style="text-align: center">
-<div class="content">
-<img src="images/jdo_text.png" alt="jdo text">
-</div>
+ <div id="index" class="paragraph">
+<p><span class="image" style="float: left"><img src="images/JDOx150.png" alt="JDOx150"></span>
+<span class="image" style="float: left"><img src="images/jdo_text.png" alt="jdo text"></span></p>
</div>
+<hr>
<div class="sect1">
-<h2 id="_jdo_test">JDO TEST</h2>
+<h2 id="_jdo_3_0_overview_a_id_jdo_3_0_overview_a">JDO 3.0 Overview<a id="JDO_3.0_Overview"></a></h2>
<div class="sectionbody">
-<hr>
<div class="sect2">
-<h3 id="_jdo_3_0_overview_a_id_jdo_3_0_overview_a">JDO 3.0 Overview<a id="JDO_3.0_Overview"></a></h3>
-<div class="sect3">
-<h4 id="_background_a_id_background_a">Background<a id="Background"></a></h4>
+<h3 id="_background_a_id_background_a">Background<a id="Background"></a></h3>
<div class="paragraph">
<p>Java Data Objects (JDO) is a specification begun in 2000, with 2 major
releases JDO1 (2002 under JSR0012) and JDO2 (2006 under JSR0243). It was
@@ -316,8 +308,8 @@ of cancel/timeout control to queries, and addition of control to the
locking of objects when read.</p>
</div>
</div>
-<div class="sect3">
-<h4 id="_metadata_api_a_id_metadata_api_a">Metadata API<a id="Metadata_API"></a></h4>
+<div class="sect2">
+<h3 id="_metadata_api_a_id_metadata_api_a">Metadata API<a id="Metadata_API"></a></h3>
<div class="paragraph">
<p>To persist Java objects you need to specify which classes are
persistable, and how they are persisted. This was traditionally handled
@@ -413,11 +405,11 @@ PersistenceManagerFactory, like this</p>
</div>
<div class="paragraph">
<p>You can view the Javadocs for the Metadata API
-<a href="http://db.apache.org/jdo/api30/apidocs/javax/jdo/metadata/package-summary.adoc">here</a>.</p>
+<a href="http://db.apache.org/jdo/api30/apidocs/javax/jdo/metadata/package-summary.html">here</a>.</p>
</div>
</div>
-<div class="sect3">
-<h4 id="_enhancer_api_a_id_enhancer_api_a">Enhancer API<a id="Enhancer_API"></a></h4>
+<div class="sect2">
+<h3 id="_enhancer_api_a_id_enhancer_api_a">Enhancer API<a id="Enhancer_API"></a></h3>
<div class="paragraph">
<p>JDO implementations typically (but aren’t compelled to) include a
bytecode enhancement step, allowing for efficient change detection of
@@ -466,11 +458,11 @@ enhancer.enhance();</pre>
</div>
<div class="paragraph">
<p>You can view the Javadocs for the Enhancer API
-<a href="http://db.apache.org/jdo/api30/apidocs/index.adoc">here</a>.</p>
+<a href="http://db.apache.org/jdo/api30/apidocs/index.html">here</a>.</p>
</div>
</div>
-<div class="sect3">
-<h4 id="_query_cancel_timeout_api_a_id_query_canceltimeout_api_a">Query Cancel/Timeout API<a id="Query_CancelTimeout_API"></a></h4>
+<div class="sect2">
+<h3 id="_query_cancel_timeout_api_a_id_query_canceltimeout_api_a">Query Cancel/Timeout API<a id="Query_CancelTimeout_API"></a></h3>
<div class="paragraph">
<p>On occasions a query may be inefficient, or may suffer from problems in
the underlying datastore, and so we don’t want to affect the
@@ -492,8 +484,8 @@ void cancel(Thread thread);</pre>
timeout.</p>
</div>
</div>
-<div class="sect3">
-<h4 id="_control_of_read_objects_locking_a_id_control_of_read_objects_locking_a">Control of read objects locking<a id="Control_of_read_objects_locking"></a></h4>
+<div class="sect2">
+<h3 id="_control_of_read_objects_locking_a_id_control_of_read_objects_locking_a">Control of read objects locking<a id="Control_of_read_objects_locking"></a></h3>
<div class="paragraph">
<p>When we are using datastore (pessimistic) transactions it often doesn’t
make sense to just lock all objects read in the transaction. For this
@@ -534,7 +526,6 @@ Boolean getSerializeRead();</pre>
<hr>
</div>
</div>
-</div>
</div>
</div>
</div>
diff --git a/docs/jdo_dtd.adoc b/docs/jdo_dtd.adoc
deleted file mode 100644
index 08c02ae..0000000
--- a/docs/jdo_dtd.adoc
+++ /dev/null
@@ -1,56 +0,0 @@
-[[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
-
-'''''
-
-:_basedir:
-:_imagesdir: images/
-:notoc:
-:titlepage:
-:grid: cols
-
-== Meta-Data - JDOanchor:Meta-Data_-_JDO[]
-
-JDO defines XML MetaData in *jdo* files as well as *orm* files. As
-always with XML, the metadata must match the defined DTD/XSD for that
-file type. This section describes the content of the *jdo* files. The
-content of *orm* files can be found link:orm_dtd.html[here]. All *jdo*
-files must contain a valid DTD/DOCTYPE specification. You can use PUBLIC
-or SYSTEM versions of these.
-
-Here are a few examples valid for *jdo* files with DTD specifications
-
-....
-<!DOCTYPE jdo PUBLIC
- "-//Sun Microsystems, Inc.//DTD Java Data Objects Metadata 3.0//EN"
- "http://xmlns.jcp.org/dtd/jdo_3_0.dtd">
-
-<!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
-....
-
-{empty} +
-
-
-Here is an example valid for *jdo* files with XSD specification
-
-....
-<?xml version="1.0" encoding="UTF-8" ?>
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
- http://xmlns.jcp.org/xml/ns/jdo/jdo_3_0.xsd">
- ...
-</jdo>
-....
-
-Your MetaData should match either the
-http://xmlns.jcp.org/dtd/jdo_3_0.dtd[DTD] or the
-http://xmlns.jcp.org/xml/ns/jdo/jdo_3_0.xsd[XSD] specification.
-
-'''''
-
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/docs/jdo_dtd.html b/docs/jdo_dtd.html
index ce2c57f..dc94ecb 100644
--- a/docs/jdo_dtd.html
+++ b/docs/jdo_dtd.html
@@ -11,9 +11,9 @@
<meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
<meta name="description" content="Apache JDO - Java Data Objects"/>
- <title>JDO TEST</title>
+ <title>Meta-Data - JDO<a id="Meta-Data_-_JDO"></a></title>
- <link rel="icon" type="image/png" href="https://tzaeschke.github.io/test-jdo-asciidoc/images/JDO_32x32.png"/>
+ <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
<!--
Apache JDO Documentation Template
@@ -280,30 +280,22 @@ table.CodeRay td.code>pre{padding:0}
<div class="row-fluid">
<div class="col-sm-9">
<div class="page-title">
- <h1>JDO TEST</h1>
+ <h1>Meta-Data - JDO<a id="Meta-Data_-_JDO"></a></h1>
</div>
<div id="doc-content">
- <div id="index" class="imageblock" style="text-align: center">
-<div class="content">
-<img src="images/JDOx150.png" alt="JDOx150">
-</div>
-</div>
-<div class="imageblock" style="text-align: center">
-<div class="content">
-<img src="images/jdo_text.png" alt="jdo text">
-</div>
+ <div id="index" class="paragraph">
+<p><span class="image" style="float: left"><img src="images/JDOx150.png" alt="JDOx150"></span>
+<span class="image" style="float: left"><img src="images/jdo_text.png" alt="jdo text"></span></p>
</div>
+<hr>
<div class="sect1">
-<h2 id="_jdo_test">JDO TEST</h2>
+<h2 id="_meta_data_jdo_a_id_meta_data_jdo_a">Meta-Data - JDO<a id="Meta-Data_-_JDO"></a></h2>
<div class="sectionbody">
-<hr>
-<div class="sect2">
-<h3 id="_meta_data_jdo_a_id_meta_data_jdo_a">Meta-Data - JDO<a id="Meta-Data_-_JDO"></a></h3>
<div class="paragraph">
<p>JDO defines XML MetaData in <strong>jdo</strong> files as well as <strong>orm</strong> files. As
always with XML, the metadata must match the defined DTD/XSD for that
file type. This section describes the content of the <strong>jdo</strong> files. The
-content of <strong>orm</strong> files can be found <a href="orm_dtd.adoc">here</a>. All <strong>jdo</strong>
+content of <strong>orm</strong> files can be found <a href="orm_dtd.html">here</a>. All <strong>jdo</strong>
files must contain a valid DTD/DOCTYPE specification. You can use PUBLIC
or SYSTEM versions of these.</p>
</div>
@@ -347,7 +339,6 @@ or SYSTEM versions of these.</p>
</div>
<hr>
</div>
-</div>
</div>
</div>
</div>
diff --git a/docs/jdo_v_jpa.adoc b/docs/jdo_v_jpa.adoc
deleted file mode 100644
index 0e0ed0d..0000000
--- a/docs/jdo_v_jpa.adoc
+++ /dev/null
@@ -1,137 +0,0 @@
-[[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
-
-'''''
-
-:_basedir:
-:_imagesdir: images/
-:notoc:
-:titlepage:
-:grid: cols
-
-== Which Persistence Specification ?anchor:Which_Persistence_Specification_[]
-
-There are several competing persistence technologies available for Java.
-Two of these are "standardised" (via the JCP). When developing your
-application you need to choose the most appropriate technology for your
-needs. *Java Data Objects (JDO)* has been a standard since 2001 with the
-release of JDO1. It was improved with the release of JDO2. Just to
-confuse issues the *Java Persistence API (JPA)* was approved in its JPA1
-form, and JDO2.1/JDO2.2 provide updates to JDO2 building on some of the
-new features of JPA1. Since then we have had JDO3 adding on extra
-metadata and enhancer standardisation, JPA2 providing criteria queries
-and JPA2.1 adding some further features. Below we show some of the
-differences of these 2 standards to give you assistance in selecting
-what you need. Highlighted in bold are the notable differences where one
-specification provides something not available in the other.
-
-[cols=",,",options="header",]
-|===
-|Feature |JDO |JPA
-|JDK Requirement |*1.3+* |1.5+
-
-|Usage |J2EE, J2SE |J2EE, J2SE
-
-|Persistence specification mechanism |XML, Annotations, *API* |XML,
-Annotations
-
-|Datastore supported |*Any* |RDBMS only
-
-|Restrictions on persisted classes |*no-arg constructor (could be added
-by compiler/enhancer)* |No final classes. No final methods. Non-private
-no-arg constructor. Identity Field. Version Field.
-
-|Ability to persist "transient" fields |*Yes* |No
-
-|Persist static/final fields |No |Not specified
-
-|Transactions |*Pessimistic*, Optimistic |Optimistic, some locking
-
-|Object Identity |*datastore-identity*, application-identity
-|application-identity
-
-|Object Identity generation |Sequence, Table, Identity, Auto, *UUID
-String, UUID Hex* |Sequence, Table, Identity, Auto
-
-|Change objects identity |*Throw exception when not allowed* |Undefined
-!!
-
-|Supported types |Java primitive types, wrappers of primitive types,
-java.lang.String, *java.lang.Number*, java.math.BigInteger,
-java.math.BigDecimal, *java.util.Currency, java.util.Locale*,
-java.util.Date, java.sql.Time, java.sql.Date, java.sql.Timestamp,
-java.io.Serializable, *boolean[]*, byte[], char[], *double[], float[],
-int[], long[], short[]*, *java.lang.Object*, *interface*, *Boolean[]*,
-Byte[], Character[], *Double[], Float[], Integer[], Long[], Short[],
-BigDecimal[], BigInteger[], String[]*, *PersistenceCapable[]*,
-*interface[]*, *Object[]*, Enums, java.util.Collection, java.util.Set,
-java.util.List, java.util.Map, *Collection/List/Map of simple types*,
-*Collection/List/Map of reference (interface/Object) types*,
-Collection/List/Map of persistable types |Java primitive types, wrappers
-of the primitive types, java.lang.String, java.math.BigInteger,
-java.math.BigDecimal, java.util.Date, *java.util.Calendar*,
-java.sql.Date, java.sql.Time, java.sql.Timestamp, java.io.Serializable,
-byte[], Byte[], char[], Character[], Enums, java.util.Collection,
-java.util.Set, java.util.List, java.util.Map Collection/List/Map of
-persistable types
-
-|Embedded Fields |Embedded persistent objects, *Embedded Collections,
-Embedded Maps* |Embedded persistent objects
-
-|Access a non-detached field |*Throw exception* |Undefined !!
-
-|Inheritance |*Each class has its own strategy* |Root class defines the
-strategy
-
-|Operation cascade default |persist, (delete) |
-
-|Operation Cascade configuration |delete |persist, delete, refresh
-
-|Query Language |JDOQL, SQL, others |JPQL, SQL
-
-|Query candidates |*Candidate without subclasses*, Candidate and its
-subclasses |Candidate and its subclasses
-
-|Query of candidate collection |*yes* |no
-
-|Query language case sensitivity |JDOQL lowercase/UPPERCASE |JPQL
-case-insensitive
-
-|Query language aliases |No, but has variables in JDOQL |Yes in JPQL
-
-|Query Criteria API |No, available as extension in QueryDSL |*Yes*
-
-|Object retrieval control |Lazy/Eager control, *fetch groups*
-|Lazy/Eager control, *entity graphs*
-
-|Bulk update/delete |JDOQL Bulk Delete |JPQL Bulk Delete, *JPQL Bulk
-Update*
-
-|RDBMS Schema Control |Tables, columns, PK columns, *PK constraints*, FK
-columns, *FK constraints*, *index columns*, *index constraints*, unique
-key columns, *unique key constraints* |Tables, columns, PK columns, FK
-columns, unique key columns
-
-|ORM Relationships |link:jdo_v_jpa_orm.html[*Full range of Collection,
-Map, List, Array, 1-1, 1-N, M-N using PC, Non-PC and interface objects*]
-|Basic 1-1, 1-N, M-N, Collection<NonPC>, Map<NonPC>
-
-|Default ORM column size |256 |255
-
-|Default ORM identifiers (tables/columns) |No |Yes
-
-|Default ORM mappings |Yes, JDBC types defined for Java types |No
-
-|Caching interface |L2 Caching API |L2 Caching API
-|===
-
-As an overall conclusion "JPA" is a subset of what is available in
-"JDO".
-
-'''''
-
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/docs/jdo_v_jpa.html b/docs/jdo_v_jpa.html
index f54af35..a9a53f6 100644
--- a/docs/jdo_v_jpa.html
+++ b/docs/jdo_v_jpa.html
@@ -11,9 +11,9 @@
<meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
<meta name="description" content="Apache JDO - Java Data Objects"/>
- <title>JDO TEST</title>
+ <title>Which Persistence Specification ?<a id="Which_Persistence_Specification_"></a></title>
- <link rel="icon" type="image/png" href="https://tzaeschke.github.io/test-jdo-asciidoc/images/JDO_32x32.png"/>
+ <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
<!--
Apache JDO Documentation Template
@@ -280,25 +280,17 @@ table.CodeRay td.code>pre{padding:0}
<div class="row-fluid">
<div class="col-sm-9">
<div class="page-title">
- <h1>JDO TEST</h1>
+ <h1>Which Persistence Specification ?<a id="Which_Persistence_Specification_"></a></h1>
</div>
<div id="doc-content">
- <div id="index" class="imageblock" style="text-align: center">
-<div class="content">
-<img src="images/JDOx150.png" alt="JDOx150">
-</div>
-</div>
-<div class="imageblock" style="text-align: center">
-<div class="content">
-<img src="images/jdo_text.png" alt="jdo text">
-</div>
+ <div id="index" class="paragraph">
+<p><span class="image" style="float: left"><img src="images/JDOx150.png" alt="JDOx150"></span>
+<span class="image" style="float: left"><img src="images/jdo_text.png" alt="jdo text"></span></p>
</div>
+<hr>
<div class="sect1">
-<h2 id="_jdo_test">JDO TEST</h2>
+<h2 id="_which_persistence_specification_a_id_which_persistence_specification_a">Which Persistence Specification ?<a id="Which_Persistence_Specification_"></a></h2>
<div class="sectionbody">
-<hr>
-<div class="sect2">
-<h3 id="_which_persistence_specification_a_id_which_persistence_specification_a">Which Persistence Specification ?<a id="Which_Persistence_Specification_"></a></h3>
<div class="paragraph">
<p>There are several competing persistence technologies available for Java.
Two of these are "standardised" (via the JCP). When developing your
@@ -490,7 +482,7 @@ columns, unique key columns</p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">ORM Relationships</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="jdo_v_jpa_orm.adoc"><strong>Full range of Collection,
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="jdo_v_jpa_orm.html"><strong>Full range of Collection,
Map, List, Array, 1-1, 1-N, M-N using PC, Non-PC and interface objects</strong></a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">Basic 1-1, 1-N, M-N, Collection<NonPC>, Map<NonPC></p></td>
</tr>
@@ -526,7 +518,6 @@ Map, List, Array, 1-1, 1-N, M-N using PC, Non-PC and interface objects</strong><
</div>
<hr>
</div>
-</div>
</div>
</div>
</div>
diff --git a/docs/jdo_v_jpa_api.adoc b/docs/jdo_v_jpa_api.adoc
deleted file mode 100644
index 72ab0af..0000000
--- a/docs/jdo_v_jpa_api.adoc
+++ /dev/null
@@ -1,41 +0,0 @@
-[[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
-
-'''''
-
-:_basedir:
-:_imagesdir: images/
-:notoc:
-:titlepage:
-:grid: cols
-
-== JDO .v. JPA : APIanchor:JDO_.v._JPA_:_API[]
-
-The two persistence standards in Java have very similar API's on the
-face of it. Here we give a comparison of the method calls and their
-equivalent in the other API.
-
-[width="100%",cols="34%,33%,33%",options="header",]
-|===
-|Operation |JDO |JPA
-|Persist Object |pm.makePersistent() |em.persist
-|Update Object |pm.makePersistent() |em.merge()
-|Remove Object |pm.deletePersistent() |em.remove()
-|Retrieve Object |pm.getObjectById() +
-pm.getExtent() |em.find()
-|Refresh Object |pm.refresh() |em.refresh()
-|Detach single Object |pm.detachCopy() |em.detach()
-|Flush changes |pm.flush() |em.flush()
-|Access transaction |pm.currentTransaction() |em.getTransaction()
-|New Query |pm.newQuery() |em.createQuery()
-|New Named Query |pm.newNamedQuery() |em.createNamedQuery()
-|New SQL Query |pm.newQuery() |em.createNativeQuery()
-|===
-
-'''''
-
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/docs/jdo_v_jpa_api.html b/docs/jdo_v_jpa_api.html
index fc3098e..6481b04 100644
--- a/docs/jdo_v_jpa_api.html
+++ b/docs/jdo_v_jpa_api.html
@@ -11,9 +11,9 @@
<meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
<meta name="description" content="Apache JDO - Java Data Objects"/>
- <title>JDO TEST</title>
+ <title>JDO .v. JPA : API<a id="JDO_.v.<em>JPA</em>:_API"></a></title>
- <link rel="icon" type="image/png" href="https://tzaeschke.github.io/test-jdo-asciidoc/images/JDO_32x32.png"/>
+ <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
<!--
Apache JDO Documentation Template
@@ -280,25 +280,17 @@ table.CodeRay td.code>pre{padding:0}
<div class="row-fluid">
<div class="col-sm-9">
<div class="page-title">
- <h1>JDO TEST</h1>
+ <h1>JDO .v. JPA : API<a id="JDO_.v.<em>JPA</em>:_API"></a></h1>
</div>
<div id="doc-content">
- <div id="index" class="imageblock" style="text-align: center">
-<div class="content">
-<img src="images/JDOx150.png" alt="JDOx150">
-</div>
-</div>
-<div class="imageblock" style="text-align: center">
-<div class="content">
-<img src="images/jdo_text.png" alt="jdo text">
-</div>
+ <div id="index" class="paragraph">
+<p><span class="image" style="float: left"><img src="images/JDOx150.png" alt="JDOx150"></span>
+<span class="image" style="float: left"><img src="images/jdo_text.png" alt="jdo text"></span></p>
</div>
+<hr>
<div class="sect1">
-<h2 id="_jdo_test">JDO TEST</h2>
+<h2 id="_jdo_v_jpa_api_a_id_jdo_v_em_jpa_em_api_a">JDO .v. JPA : API<a id="JDO_.v.<em>JPA</em>:_API"></a></h2>
<div class="sectionbody">
-<hr>
-<div class="sect2">
-<h3 id="_jdo_v_jpa_api_a_id_jdo_v_em_jpa_em_api_a">JDO .v. JPA : API<a id="JDO_.v.<em>JPA</em>:_API"></a></h3>
<div class="paragraph">
<p>The two persistence standards in Java have very similar API’s on the
face of it. Here we give a comparison of the method calls and their
@@ -382,7 +374,6 @@ pm.getExtent()</p></td>
</div>
<hr>
</div>
-</div>
</div>
</div>
</div>
diff --git a/docs/jdo_v_jpa_orm.adoc b/docs/jdo_v_jpa_orm.adoc
deleted file mode 100644
index ec1f71f..0000000
--- a/docs/jdo_v_jpa_orm.adoc
+++ /dev/null
@@ -1,269 +0,0 @@
-[[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
-
-'''''
-
-:_basedir:
-:_imagesdir: images/
-:notoc:
-:titlepage:
-:grid: cols
-
-== Which ORM specification ?anchor:Which_ORM_specification_[]
-
-There are 2 prevalent specification in the Java ORM world. JDO provides
-the most complete definition, whilst JPA is the most recent.
-
-=== Relationshipsanchor:Relationships[]
-
-In this guide we show the different types of ORM relation commonly used,
-and mark against it which specification supports it. This list is not
-yet complete but will be added to to provide a comprehensive list of
-relationship type and where you can find it.
-
-[cols=",,,",options="header",]
-|===
-|Field Type |Relation |JDO |JPA
-|PC
-|http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_one.html#uni[1-1
-Unidirectional] |image:images/icon_success_sml.png[image]
-|image:images/icon_success_sml.png[image]
-
-|PC
-|http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_one.html#bi[1-1
-Bidirectional] |image:images/icon_success_sml.png[image]
-|image:images/icon_success_sml.png[image]
-
-|PC
-|http://www.datanucleus.org/products/accessplatform/jdo/orm/serialised.html#PC[1-1
-serialised] |image:images/icon_success_sml.png[image]
-|image:images/icon_success_sml.png[image]
-
-|PC
-|http://www.datanucleus.org/products/accessplatform/jdo/orm/compound_identity.html#1_1_uni[1-1
-CompoundIdentity Unidirectional]
-|image:images/icon_success_sml.png[image]
-|image:images/icon_success_sml.png[image]
-
-|PC
-|http://www.datanucleus.org/products/accessplatform/jdo/orm/compound_identity.html#1_N_coll_bi[1-N
-CompoundIdentity Collection Bidirectional]
-|image:images/icon_success_sml.png[image]
-|image:images/icon_success_sml.png[image]
-
-|PC
-|http://www.datanucleus.org/products/accessplatform/jdo/orm/compound_identity.html#1_N_map_bi[1-N
-CompoundIdentity Map Bidirectional]
-|image:images/icon_success_sml.png[image]
-|image:images/icon_error_sml.png[image]
-
-|Interface
-|http://www.datanucleus.org/products/accessplatform/jdo/orm/interfaces.html[1-1
-Unidirectional] |image:images/icon_success_sml.png[image]
-|image:images/icon_error_sml.png[image]
-
-|Interface
-|http://www.datanucleus.org/products/accessplatform/jdo/orm/interfaces.html[1-1
-Bidirectional] |image:images/icon_success_sml.png[image]
-|image:images/icon_error_sml.png[image]
-
-|Interface
-|http://www.datanucleus.org/products/accessplatform/jdo/orm/serialised.html#Reference[1-1
-serialised] |image:images/icon_success_sml.png[image] |?
-
-|Collection<PC>
-|http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_collection.html#fk_uni[1-N
-ForeignKey Unidirectional Collection]
-|image:images/icon_success_sml.png[image]
-|image:images/icon_success_sml.png[image]
-
-|Collection<PC>
-|http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_collection.html#fk_bi[1-N
-ForeignKey Bidirectional Collection]
-|image:images/icon_success_sml.png[image]
-|image:images/icon_success_sml.png[image]
-
-|Collection<PC>
-|http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_collection.html#join_uni[1-N
-JoinTable Unidirectional Collection]
-|image:images/icon_success_sml.png[image]
-|image:images/icon_success_sml.png[image]
-
-|Collection<PC>
-|http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_collection.html#join_bi[1-N
-JoinTable Bidirectional Collection]
-|image:images/icon_success_sml.png[image]
-|image:images/icon_success_sml.png[image]
-
-|Collection<Non-PC>
-|http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_collection.html#join_nonpc[1-N
-JoinTable Collection] |image:images/icon_success_sml.png[image]
-|image:images/icon_success_sml.png[image]
-
-|Collection<PC>
-|http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_collection.html#shared_join[1-N
-JoinTable Collection using shared JoinTable]
-|image:images/icon_error_sml.png[image]
-|image:images/icon_error_sml.png[image]
-
-|Collection<PC>
-|http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_collection.html#shared_fk[1-N
-ForeignKey Collection using shared ForeignKey]
-|image:images/icon_error_sml.png[image]
-|image:images/icon_error_sml.png[image]
-
-|Collection<PC>
-|http://www.datanucleus.org/products/accessplatform/jdo/orm/many_to_many.html[M-N
-JoinTable] |image:images/icon_success_sml.png[image]
-|image:images/icon_success_sml.png[image]
-
-|Collection<PC>
-|http://www.datanucleus.org/products/accessplatform/jdo/orm/compound_identity.html#1_N_uni[1-N
-CompoundIdentity Unidirectional]
-|image:images/icon_success_sml.png[image]
-|image:images/icon_success_sml.png[image]
-
-|Collection<PC>
-|http://www.datanucleus.org/products/accessplatform/jdo/orm/serialised.html#Collection[1-N
-serialised Collection] |image:images/icon_success_sml.png[image]
-|image:images/icon_success_sml.png[image]
-
-|Collection<PC>
-|http://www.datanucleus.org/products/accessplatform/jdo/orm/serialised.html#CollectionElements[1-N
-JoinTable Collection of serialised elements]
-|image:images/icon_success_sml.png[image]
-|image:images/icon_error_sml.png[image]
-
-|List<PC>
-|http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_list.html#fk_uni[1-N
-ForeignKey Unidirectional Indexed List]
-|image:images/icon_success_sml.png[image]
-|image:images/icon_success_sml.png[image]
-
-|List<PC>
-|http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_list.html#fk_bi[1-N
-ForeignKey Bidirectional Indexed List]
-|image:images/icon_success_sml.png[image]
-|image:images/icon_success_sml.png[image]
-
-|List<PC>
-|http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_list.html#join_uni[1-N
-JoinTable Unidirectional Indexed List]
-|image:images/icon_success_sml.png[image]
-|image:images/icon_success_sml.png[image]
-
-|List<PC>
-|http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_list.html#join_bi[1-N
-JoinTable Bidirectional Indexed List]
-|image:images/icon_success_sml.png[image]
-|image:images/icon_success_sml.png[image]
-
-|List<Non-PC>
-|http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_list.html#join_nonpc[1-N
-JoinTable Indexed List] |image:images/icon_success_sml.png[image]
-|image:images/icon_success_sml.png[image]
-
-|List<PC>
-|http://www.datanucleus.org/products/accessplatform/jpa/orm/one_to_many_list.html#fk_uni[1-N
-ForeignKey Unidirectional Ordered List]
-|image:images/icon_error_sml.png[image]
-|image:images/icon_success_sml.png[image]
-
-|List<PC>
-|http://www.datanucleus.org/products/accessplatform/jpa/orm/one_to_many_list.html#fk_bi[1-N
-ForeignKey Bidirectional Ordered List]
-|image:images/icon_error_sml.png[image]
-|image:images/icon_success_sml.png[image]
-
-|List<PC>
-|http://www.datanucleus.org/products/accessplatform/jpa/orm/one_to_many_list.html#join_uni[1-N
-JoinTable Unidirectional Ordered List]
-|image:images/icon_error_sml.png[image]
-|image:images/icon_success_sml.png[image]
-
-|List<PC>
-|http://www.datanucleus.org/products/accessplatform/jpa/orm/one_to_many_list.html#join_bi[1-N
-JoinTable Bidirectional Ordered List]
-|image:images/icon_error_sml.png[image]
-|image:images/icon_success_sml.png[image]
-
-|Map<PC, PC>
-|http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_map.html#join_pc_pc[1-N
-JoinTable Map] |image:images/icon_success_sml.png[image]
-|image:images/icon_error_sml.png[image]
-
-|Map<Non-PC, PC>
-|http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_map.html#join_simple_pc[1-N
-JoinTable Map] |image:images/icon_success_sml.png[image]
-|image:images/icon_error_sml.png[image]
-
-|Map<PC, Non-PC>
-|http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_map.html#join_pc_simple[1-N
-JoinTable Map] |image:images/icon_success_sml.png[image]
-|image:images/icon_error_sml.png[image]
-
-|Map<Non-PC, Non-PC>
-|http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_map.html#join_simple_simple[1-N
-JoinTable Map] |image:images/icon_success_sml.png[image]
-|image:images/icon_error_sml.png[image]
-
-|Map<Non-PC, PC>
-|http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_map.html#fk_uni_key[1-N
-ForeignKey Map Unidirectional (key stored in value)]
-|image:images/icon_success_sml.png[image]
-|image:images/icon_success_sml.png[image]
-
-|Map<Non-PC, PC>
-|http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_map.html#fk_bi_key[1-N
-ForeignKey Map Bidirectional (key stored in value)]
-|image:images/icon_success_sml.png[image]
-|image:images/icon_success_sml.png[image]
-
-|Map<PC, Non-PC>
-|http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_map.html#fk_uni_value[1-N
-ForeignKey Map Unidirectional (value stored in key)]
-|image:images/icon_success_sml.png[image]
-|image:images/icon_error_sml.png[image]
-
-|Map<PC, PC>
-|http://www.datanucleus.org/products/accessplatform/jdo/orm/serialised.html#Map[1-N
-serialised Map] |image:images/icon_success_sml.png[image]
-|image:images/icon_success_sml.png[image]
-
-|Map<PC, PC>
-|http://www.datanucleus.org/products/accessplatform/jdo/orm/serialised.html#MapKeysValues[1-N
-JoinTable Map of serialised keys/values]
-|image:images/icon_success_sml.png[image]
-|image:images/icon_error_sml.png[image]
-
-|PC[ ]
-|http://www.datanucleus.org/products/accessplatform/jdo/orm/arrays.html#fk[1-N
-ForeignKey Unidirectional Array]
-|image:images/icon_success_sml.png[image]
-|image:images/icon_error_sml.png[image]
-
-|PC[ ]
-|http://www.datanucleus.org/products/accessplatform/jdo/orm/arrays.html#join[1-N
-JoinTable Unidirectional Array]
-|image:images/icon_success_sml.png[image]
-|image:images/icon_error_sml.png[image]
-
-|PC[ ]
-|http://www.datanucleus.org/products/accessplatform/jdo/orm/serialised.html#Array[1-N
-serialised Array] |image:images/icon_success_sml.png[image]
-|image:images/icon_success_sml.png[image]
-
-|Non-PC[ ]
-|http://www.datanucleus.org/products/accessplatform/jdo/orm/arrays.html#join[1-N
-JoinTable Unidirectional Array]
-|image:images/icon_success_sml.png[image]
-|image:images/icon_error_sml.png[image]
-|===
-
-'''''
-
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/docs/jdo_v_jpa_orm.html b/docs/jdo_v_jpa_orm.html
index 480d9c5..96646b4 100644
--- a/docs/jdo_v_jpa_orm.html
+++ b/docs/jdo_v_jpa_orm.html
@@ -11,9 +11,9 @@
<meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
<meta name="description" content="Apache JDO - Java Data Objects"/>
- <title>JDO TEST</title>
+ <title>Which ORM specification ?<a id="Which_ORM_specification_"></a></title>
- <link rel="icon" type="image/png" href="https://tzaeschke.github.io/test-jdo-asciidoc/images/JDO_32x32.png"/>
+ <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
<!--
Apache JDO Documentation Template
@@ -280,31 +280,23 @@ table.CodeRay td.code>pre{padding:0}
<div class="row-fluid">
<div class="col-sm-9">
<div class="page-title">
- <h1>JDO TEST</h1>
+ <h1>Which ORM specification ?<a id="Which_ORM_specification_"></a></h1>
</div>
<div id="doc-content">
- <div id="index" class="imageblock" style="text-align: center">
-<div class="content">
-<img src="images/JDOx150.png" alt="JDOx150">
-</div>
-</div>
-<div class="imageblock" style="text-align: center">
-<div class="content">
-<img src="images/jdo_text.png" alt="jdo text">
-</div>
+ <div id="index" class="paragraph">
+<p><span class="image" style="float: left"><img src="images/JDOx150.png" alt="JDOx150"></span>
+<span class="image" style="float: left"><img src="images/jdo_text.png" alt="jdo text"></span></p>
</div>
+<hr>
<div class="sect1">
-<h2 id="_jdo_test">JDO TEST</h2>
+<h2 id="_which_orm_specification_a_id_which_orm_specification_a">Which ORM specification ?<a id="Which_ORM_specification_"></a></h2>
<div class="sectionbody">
-<hr>
-<div class="sect2">
-<h3 id="_which_orm_specification_a_id_which_orm_specification_a">Which ORM specification ?<a id="Which_ORM_specification_"></a></h3>
<div class="paragraph">
<p>There are 2 prevalent specification in the Java ORM world. JDO provides
the most complete definition, whilst JPA is the most recent.</p>
</div>
-<div class="sect3">
-<h4 id="_relationships_a_id_relationships_a">Relationships<a id="Relationships"></a></h4>
+<div class="sect2">
+<h3 id="_relationships_a_id_relationships_a">Relationships<a id="Relationships"></a></h3>
<div class="paragraph">
<p>In this guide we show the different types of ORM relation commonly used,
and mark against it which specification supports it. This list is not
@@ -329,294 +321,294 @@ relationship type and where you can find it.</p>
<tbody>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">PC</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_one.adoc#uni">1-1
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_one.html#uni">1-1
Unidirectional</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_success_sml.png" alt="image"></span></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_success_sml.png" alt="image"></span></p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">PC</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_one.adoc#bi">1-1
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_one.html#bi">1-1
Bidirectional</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_success_sml.png" alt="image"></span></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_success_sml.png" alt="image"></span></p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">PC</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/serialised.adoc#PC">1-1
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/serialised.html#PC">1-1
serialised</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_success_sml.png" alt="image"></span></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_success_sml.png" alt="image"></span></p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">PC</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/compound_identity.adoc#1_1_uni">1-1
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/compound_identity.html#1_1_uni">1-1
CompoundIdentity Unidirectional</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_success_sml.png" alt="image"></span></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_success_sml.png" alt="image"></span></p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">PC</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/compound_identity.adoc#1_N_coll_bi">1-N
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/compound_identity.html#1_N_coll_bi">1-N
CompoundIdentity Collection Bidirectional</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_success_sml.png" alt="image"></span></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_success_sml.png" alt="image"></span></p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">PC</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/compound_identity.adoc#1_N_map_bi">1-N
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/compound_identity.html#1_N_map_bi">1-N
CompoundIdentity Map Bidirectional</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_success_sml.png" alt="image"></span></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_error_sml.png" alt="image"></span></p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">Interface</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/interfaces.adoc">1-1
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/interfaces.html">1-1
Unidirectional</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_success_sml.png" alt="image"></span></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_error_sml.png" alt="image"></span></p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">Interface</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/interfaces.adoc">1-1
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/interfaces.html">1-1
Bidirectional</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_success_sml.png" alt="image"></span></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_error_sml.png" alt="image"></span></p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">Interface</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/serialised.adoc#Reference">1-1
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/serialised.html#Reference">1-1
serialised</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_success_sml.png" alt="image"></span></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">?</p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">Collection<PC></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_collection.adoc#fk_uni">1-N
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_collection.html#fk_uni">1-N
ForeignKey Unidirectional Collection</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_success_sml.png" alt="image"></span></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_success_sml.png" alt="image"></span></p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">Collection<PC></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_collection.adoc#fk_bi">1-N
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_collection.html#fk_bi">1-N
ForeignKey Bidirectional Collection</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_success_sml.png" alt="image"></span></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_success_sml.png" alt="image"></span></p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">Collection<PC></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_collection.adoc#join_uni">1-N
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_collection.html#join_uni">1-N
JoinTable Unidirectional Collection</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_success_sml.png" alt="image"></span></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_success_sml.png" alt="image"></span></p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">Collection<PC></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_collection.adoc#join_bi">1-N
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_collection.html#join_bi">1-N
JoinTable Bidirectional Collection</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_success_sml.png" alt="image"></span></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_success_sml.png" alt="image"></span></p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">Collection<Non-PC></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_collection.adoc#join_nonpc">1-N
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_collection.html#join_nonpc">1-N
JoinTable Collection</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_success_sml.png" alt="image"></span></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_success_sml.png" alt="image"></span></p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">Collection<PC></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_collection.adoc#shared_join">1-N
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_collection.html#shared_join">1-N
JoinTable Collection using shared JoinTable</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_error_sml.png" alt="image"></span></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_error_sml.png" alt="image"></span></p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">Collection<PC></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_collection.adoc#shared_fk">1-N
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_collection.html#shared_fk">1-N
ForeignKey Collection using shared ForeignKey</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_error_sml.png" alt="image"></span></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_error_sml.png" alt="image"></span></p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">Collection<PC></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/many_to_many.adoc">M-N
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/many_to_many.html">M-N
JoinTable</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_success_sml.png" alt="image"></span></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_success_sml.png" alt="image"></span></p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">Collection<PC></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/compound_identity.adoc#1_N_uni">1-N
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/compound_identity.html#1_N_uni">1-N
CompoundIdentity Unidirectional</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_success_sml.png" alt="image"></span></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_success_sml.png" alt="image"></span></p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">Collection<PC></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/serialised.adoc#Collection">1-N
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/serialised.html#Collection">1-N
serialised Collection</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_success_sml.png" alt="image"></span></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_success_sml.png" alt="image"></span></p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">Collection<PC></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/serialised.adoc#CollectionElements">1-N
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/serialised.html#CollectionElements">1-N
JoinTable Collection of serialised elements</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_success_sml.png" alt="image"></span></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_error_sml.png" alt="image"></span></p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">List<PC></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_list.adoc#fk_uni">1-N
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_list.html#fk_uni">1-N
ForeignKey Unidirectional Indexed List</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_success_sml.png" alt="image"></span></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_success_sml.png" alt="image"></span></p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">List<PC></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_list.adoc#fk_bi">1-N
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_list.html#fk_bi">1-N
ForeignKey Bidirectional Indexed List</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_success_sml.png" alt="image"></span></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_success_sml.png" alt="image"></span></p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">List<PC></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_list.adoc#join_uni">1-N
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_list.html#join_uni">1-N
JoinTable Unidirectional Indexed List</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_success_sml.png" alt="image"></span></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_success_sml.png" alt="image"></span></p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">List<PC></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_list.adoc#join_bi">1-N
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_list.html#join_bi">1-N
JoinTable Bidirectional Indexed List</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_success_sml.png" alt="image"></span></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_success_sml.png" alt="image"></span></p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">List<Non-PC></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_list.adoc#join_nonpc">1-N
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_list.html#join_nonpc">1-N
JoinTable Indexed List</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_success_sml.png" alt="image"></span></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_success_sml.png" alt="image"></span></p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">List<PC></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jpa/orm/one_to_many_list.adoc#fk_uni">1-N
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jpa/orm/one_to_many_list.html#fk_uni">1-N
ForeignKey Unidirectional Ordered List</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_error_sml.png" alt="image"></span></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_success_sml.png" alt="image"></span></p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">List<PC></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jpa/orm/one_to_many_list.adoc#fk_bi">1-N
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jpa/orm/one_to_many_list.html#fk_bi">1-N
ForeignKey Bidirectional Ordered List</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_error_sml.png" alt="image"></span></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_success_sml.png" alt="image"></span></p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">List<PC></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jpa/orm/one_to_many_list.adoc#join_uni">1-N
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jpa/orm/one_to_many_list.html#join_uni">1-N
JoinTable Unidirectional Ordered List</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_error_sml.png" alt="image"></span></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_success_sml.png" alt="image"></span></p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">List<PC></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jpa/orm/one_to_many_list.adoc#join_bi">1-N
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jpa/orm/one_to_many_list.html#join_bi">1-N
JoinTable Bidirectional Ordered List</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_error_sml.png" alt="image"></span></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_success_sml.png" alt="image"></span></p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">Map<PC, PC></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_map.adoc#join_pc_pc">1-N
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_map.html#join_pc_pc">1-N
JoinTable Map</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_success_sml.png" alt="image"></span></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_error_sml.png" alt="image"></span></p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">Map<Non-PC, PC></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_map.adoc#join_simple_pc">1-N
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_map.html#join_simple_pc">1-N
JoinTable Map</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_success_sml.png" alt="image"></span></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_error_sml.png" alt="image"></span></p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">Map<PC, Non-PC></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_map.adoc#join_pc_simple">1-N
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_map.html#join_pc_simple">1-N
JoinTable Map</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_success_sml.png" alt="image"></span></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_error_sml.png" alt="image"></span></p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">Map<Non-PC, Non-PC></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_map.adoc#join_simple_simple">1-N
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_map.html#join_simple_simple">1-N
JoinTable Map</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_success_sml.png" alt="image"></span></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_error_sml.png" alt="image"></span></p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">Map<Non-PC, PC></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_map.adoc#fk_uni_key">1-N
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_map.html#fk_uni_key">1-N
ForeignKey Map Unidirectional (key stored in value)</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_success_sml.png" alt="image"></span></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_success_sml.png" alt="image"></span></p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">Map<Non-PC, PC></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_map.adoc#fk_bi_key">1-N
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_map.html#fk_bi_key">1-N
ForeignKey Map Bidirectional (key stored in value)</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_success_sml.png" alt="image"></span></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_success_sml.png" alt="image"></span></p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">Map<PC, Non-PC></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_map.adoc#fk_uni_value">1-N
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_map.html#fk_uni_value">1-N
ForeignKey Map Unidirectional (value stored in key)</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_success_sml.png" alt="image"></span></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_error_sml.png" alt="image"></span></p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">Map<PC, PC></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/serialised.adoc#Map">1-N
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/serialised.html#Map">1-N
serialised Map</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_success_sml.png" alt="image"></span></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_success_sml.png" alt="image"></span></p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">Map<PC, PC></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/serialised.adoc#MapKeysValues">1-N
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/serialised.html#MapKeysValues">1-N
JoinTable Map of serialised keys/values</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_success_sml.png" alt="image"></span></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_error_sml.png" alt="image"></span></p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">PC[ ]</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/arrays.adoc#fk">1-N
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/arrays.html#fk">1-N
ForeignKey Unidirectional Array</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_success_sml.png" alt="image"></span></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_error_sml.png" alt="image"></span></p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">PC[ ]</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/arrays.adoc#join">1-N
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/arrays.html#join">1-N
JoinTable Unidirectional Array</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_success_sml.png" alt="image"></span></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_error_sml.png" alt="image"></span></p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">PC[ ]</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/serialised.adoc#Array">1-N
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/serialised.html#Array">1-N
serialised Array</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_success_sml.png" alt="image"></span></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_success_sml.png" alt="image"></span></p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">Non-PC[ ]</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/arrays.adoc#join">1-N
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.datanucleus.org/products/accessplatform/jdo/orm/arrays.html#join">1-N
JoinTable Unidirectional Array</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_success_sml.png" alt="image"></span></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_error_sml.png" alt="image"></span></p></td>
@@ -630,7 +622,6 @@ JoinTable Unidirectional Array</a></p></td>
<hr>
</div>
</div>
-</div>
</div>
</div>
</div>
diff --git a/docs/jdocentral.adoc b/docs/jdocentral.adoc
deleted file mode 100644
index a747718..0000000
--- a/docs/jdocentral.adoc
+++ /dev/null
@@ -1,32 +0,0 @@
-[[index]]
-image::images/JDOx150.png[align="center"]
-image::images/jdo_text.png[align="center"]
-== JDO TEST
-
-'''''
-
... 6147 lines suppressed ...