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 Craig L Russell <cr...@oracle.com> on 2010/05/19 17:15:27 UTC
New jdo projects in svn repo
I've added api and tck to the trunk and updated them to 3.0.
I've removed the model20 and enhancer20 dependencies from tck.
I think these are pretty close to what we want to ship for the next
release. Can others please try the two projects and see if there are
any issues?
Thanks,
Craig
Craig L Russell
Architect, Oracle
http://db.apache.org/jdo
408 276-5638 mailto:Craig.Russell@oracle.com
P.S. A good JDO? O, Gasp!
Re: New jdo projects in svn repo
Posted by Michael Bouschen <mb...@spree.de>.
Hi,
I propose to adapt the README.html and the RunRules.html under tck.
Attached you find a patch, please have a look.
Regards Michael
> Hi Andy, hi Craig,
>
> I renamed all the 2.3 Metadata artifacts to 3.0, e.g jdo_2_3.xsd to
> jdo_3_0.xsd, etc. (see revision 947505). I changed all the .jdo,
> .jdoquery and .orm files in tck to refer the 3.0 xsd files.
>
> I also added a JDO3.MF Manifest file to the root directory and changed
> the projects.properties in api and tck to refer JDO3.MF and API3.MF.
>
> Regards Michael
>
>> Hi Craig,
>>
>>
>>
>>> Will this be affected by renaming all the schema files in api/src/
>>> schema/javax/jdo?
>>> There won't be a jdo_2_3.xsd or any other 2_3 artifacts, just 3.0. And
>>> the content will also be changed.
>>>
>>>
>> Good point.
>> I've just added "3.0" DTD/XSD local variants into the "datanucleus-core" jar
>> that we use when people specify those in their XML files. Since we'll have
>> users who may have specified "2.3" variants in their XML files, I'll retain
>> support for those and direct them to the 3.0 local copies. Will be in our
>> nightly builds from tonight.
>>
>>
>>
>>
>
>
>
--
*Michael Bouschen*
*Prokurist*
akquinet tech@spree GmbH
Bülowstr. 66, D-10783 Berlin
Fon: +49 30 235 520-33
Fax: +49 30 217 520-12
Email: michael.bouschen@akquinet.de
Url: www.akquinet.de <http://www.akquinet.de>
akquinet tech@spree GmbH, Berlin
Geschäftsführung: Martin Weber, Prof. Dr. Christian Roth
Amtsgericht Berlin-Charlottenburg HRB 86780 B
USt.-Id. Nr.: DE 225 964 680
Re: New jdo projects in svn repo
Posted by Michael Bouschen <mb...@spree.de>.
Hi Andy, hi Craig,
I renamed all the 2.3 Metadata artifacts to 3.0, e.g jdo_2_3.xsd to
jdo_3_0.xsd, etc. (see revision 947505). I changed all the .jdo,
.jdoquery and .orm files in tck to refer the 3.0 xsd files.
I also added a JDO3.MF Manifest file to the root directory and changed
the projects.properties in api and tck to refer JDO3.MF and API3.MF.
Regards Michael
> Hi Craig,
>
>
>> Will this be affected by renaming all the schema files in api/src/
>> schema/javax/jdo?
>> There won't be a jdo_2_3.xsd or any other 2_3 artifacts, just 3.0. And
>> the content will also be changed.
>>
>
> Good point.
> I've just added "3.0" DTD/XSD local variants into the "datanucleus-core" jar
> that we use when people specify those in their XML files. Since we'll have
> users who may have specified "2.3" variants in their XML files, I'll retain
> support for those and direct them to the 3.0 local copies. Will be in our
> nightly builds from tonight.
>
>
>
--
*Michael Bouschen*
*Prokurist*
akquinet tech@spree GmbH
Bülowstr. 66, D-10783 Berlin
Fon: +49 30 235 520-33
Fax: +49 30 217 520-12
Email: michael.bouschen@akquinet.de
Url: www.akquinet.de <http://www.akquinet.de>
akquinet tech@spree GmbH, Berlin
Geschäftsführung: Martin Weber, Prof. Dr. Christian Roth
Amtsgericht Berlin-Charlottenburg HRB 86780 B
USt.-Id. Nr.: DE 225 964 680
Re: New jdo projects in svn repo
Posted by Andy Jefferson <an...@datanucleus.org>.
Hi Craig,
> Will this be affected by renaming all the schema files in api/src/
> schema/javax/jdo?
> There won't be a jdo_2_3.xsd or any other 2_3 artifacts, just 3.0. And
> the content will also be changed.
Good point.
I've just added "3.0" DTD/XSD local variants into the "datanucleus-core" jar
that we use when people specify those in their XML files. Since we'll have
users who may have specified "2.3" variants in their XML files, I'll retain
support for those and direct them to the 3.0 local copies. Will be in our
nightly builds from tonight.
--
Andy
DataNucleus (http://www.datanucleus.org)
Re: New jdo projects in svn repo
Posted by Craig L Russell <cr...@oracle.com>.
Hi Andy,
Will this be affected by renaming all the schema files in api/src/
schema/javax/jdo?
There won't be a jdo_2_3.xsd or any other 2_3 artifacts, just 3.0. And
the content will also be changed.
I'll make this change as soon as I can get to it. There are some
internal tests in api that need to use the new names.
Craig
On May 21, 2010, at 6:25 AM, Andy Jefferson wrote:
>> Ok, I fixed all of these.
>
> Seems ok for me.
>
> PS. Since DataNucleus 2.0 is not getting much work now, and since we
> need a
> release of DataNucleus as "RI" that refers to Maven artifact name
> "jdo-api",
> the "RI" for JDO3 ought to be DataNucleus 2.1 (scheduled "final"
> release date
> mid June). It passes the TCK. I'll update the TCK DN jar versions
> sometime
> soon.
>
>
> --
> Andy
> DataNucleus (http://www.datanucleus.org)
Craig L Russell
Architect, Oracle
http://db.apache.org/jdo
408 276-5638 mailto:Craig.Russell@oracle.com
P.S. A good JDO? O, Gasp!
Re: New jdo projects in svn repo
Posted by Andy Jefferson <an...@datanucleus.org>.
> Ok, I fixed all of these.
Seems ok for me.
PS. Since DataNucleus 2.0 is not getting much work now, and since we need a
release of DataNucleus as "RI" that refers to Maven artifact name "jdo-api",
the "RI" for JDO3 ought to be DataNucleus 2.1 (scheduled "final" release date
mid June). It passes the TCK. I'll update the TCK DN jar versions sometime
soon.
--
Andy
DataNucleus (http://www.datanucleus.org)
Re: New jdo projects in svn repo
Posted by Craig L Russell <cr...@oracle.com>.
Ok, I fixed all of these.
svn commit -m "Update to JDO 3" project.properties api/project.xml api/
pom.xml tck/src/conf/enhancement.conf
Sending api/pom.xml
Sending api/project.xml
Sending project.properties
Sending tck/src/conf/enhancement.conf
Transmitting file data ....
Committed revision 946804.
Craig
On May 19, 2010, at 8:51 AM, Andy Jefferson wrote:
> Hi Craig,
>
>> I think these are pretty close to what we want to ship for the next
>> release. Can others please try the two projects and see if there are
>> any issues?
>
> api builds ok for me, but creates 2.3-SNAPSHOT (from parent
> project.xml) not
> 3.0-SNAPSHOT
>
> api/pom.xml has artifactId="jdo2-api" and name="JDO2 API".
> Should be "jdo-api" and "JDO API"
>
> api/project.xml has name="JDO2 API"
> Should be "JDO API"
>
>
>
> tck
> enhancement.conf gave
> [java] Cannot find test class
> 'org.apache.jdo.tck.enhancement.FieldAccessModified'.
> [java] Cannot find test class
> 'org.apache.jdo.tck.enhancement.ImplementsPersistenceCapable'.
> Maybe these are tests that shouldn't be run or something ?
>
>
>
>
>
> --
> Andy
> DataNucleus (http://www.datanucleus.org)
Craig L Russell
Architect, Oracle
http://db.apache.org/jdo
408 276-5638 mailto:Craig.Russell@oracle.com
P.S. A good JDO? O, Gasp!
Re: New jdo projects in svn repo
Posted by Craig L Russell <cr...@oracle.com>.
I found a couple more 2.3 to 3.0 items in api/src/schema/javax/jdo
I'll rename these once I find them.
There might be some RI dependencies as well on these artifacts.
Craig
On May 19, 2010, at 5:46 PM, Craig L Russell wrote:
> Yes, please check in this change.
>
> Regards,
>
> Craig
>
> On May 19, 2010, at 12:26 PM, Michael Bouschen wrote:
>
>> Hi Craig,
>>
>> I see the same results as Andy.
>>
>> I propose a minor change in the api project: replace @since 2.3 by
>> @since 3.0 in the javadoc. Attached you find a patch implementing
>> the change. I can check it in, please let me know.
>>
>> Regards Michael
>>
>>> Hi Andy,
>>>
>>> I think I understand all of this and will fix shortly.
>>>
>>> Thanks,
>>>
>>> Craig
>>>
>>> On May 19, 2010, at 8:51 AM, Andy Jefferson wrote:
>>>
>>>
>>>> Hi Craig,
>>>>
>>>>
>>>>> I think these are pretty close to what we want to ship for the
>>>>> next
>>>>> release. Can others please try the two projects and see if there
>>>>> are
>>>>> any issues?
>>>>>
>>>> api builds ok for me, but creates 2.3-SNAPSHOT (from parent
>>>> project.xml) not
>>>> 3.0-SNAPSHOT
>>>>
>>>> api/pom.xml has artifactId="jdo2-api" and name="JDO2 API".
>>>> Should be "jdo-api" and "JDO API"
>>>>
>>>> api/project.xml has name="JDO2 API"
>>>> Should be "JDO API"
>>>>
>>>>
>>>>
>>>> tck
>>>> enhancement.conf gave
>>>> [java] Cannot find test class
>>>> 'org.apache.jdo.tck.enhancement.FieldAccessModified'.
>>>> [java] Cannot find test class
>>>> 'org.apache.jdo.tck.enhancement.ImplementsPersistenceCapable'.
>>>> Maybe these are tests that shouldn't be run or something ?
>>>>
>>>>
>>>>
>>>>
>>>>
>>>> --
>>>> Andy
>>>> DataNucleus (http://www.datanucleus.org)
>>>>
>>>
>>> Craig L Russell
>>> Architect, Oracle
>>> http://db.apache.org/jdo
>>> 408 276-5638 mailto:Craig.Russell@oracle.com
>>> P.S. A good JDO? O, Gasp!
>>>
>>>
>>
>>
>> --
>> Michael Bouschen
>> Prokurist
>>
>> akquinet tech@spree GmbH
>> Bülowstr. 66, D-10783 Berlin
>>
>> Fon: +49 30 235 520-33
>> Fax: +49 30 217 520-12
>> Email: michael.bouschen@akquinet.de
>> Url: www.akquinet.de
>>
>> akquinet tech@spree GmbH, Berlin
>> Geschäftsführung: Martin Weber, Prof. Dr. Christian Roth
>> Amtsgericht Berlin-Charlottenburg HRB 86780 B
>> USt.-Id. Nr.: DE 225 964 680
>> Index: api/src/java/javax/jdo/Query.java
>> ===================================================================
>> --- api/src/java/javax/jdo/Query.java (Revision 946329)
>> +++ api/src/java/javax/jdo/Query.java (Arbeitskopie)
>> @@ -713,7 +713,7 @@
>> * PersistenceManagerFactory.supportedOptions().
>> * If timeouts are not supported,this method will throw
>> * JDOUnsupportedOptionException.
>> - * @since 2.3
>> + * @since 3.0
>> * @param interval the timeout interval (milliseconds)
>> */
>> void setDatastoreReadTimeoutMillis(Integer interval);
>> @@ -724,7 +724,7 @@
>> * @see #setDatastoreReadTimeoutMillis(Integer)
>> * @see PersistenceManager#setDatastoreReadTimeoutMillis(Integer)
>> * @return the effective timeout setting (milliseconds).
>> - * @since 2.3
>> + * @since 3.0
>> */
>> Integer getDatastoreReadTimeoutMillis();
>>
>> @@ -744,7 +744,7 @@
>> * PersistenceManagerFactory.supportedOptions().
>> * If timeouts are not supported,this method will throw
>> * JDOUnsupportedOptionException.
>> - * @since 2.3
>> + * @since 3.0
>> * @param interval the timeout interval (milliseconds)
>> */
>> void setDatastoreWriteTimeoutMillis(Integer interval);
>> @@ -755,7 +755,7 @@
>> * @see #setDatastoreWriteTimeoutMillis(Integer)
>> * @see
>> PersistenceManager#setDatastoreWriteTimeoutMillis(Integer)
>> * @return the effective timeout setting (milliseconds).
>> - * @since 2.3
>> + * @since 3.0
>> */
>> Integer getDatastoreWriteTimeoutMillis();
>>
>> @@ -765,7 +765,7 @@
>> * throw JDOUnsupportedOptionException.
>> * If the cancellation fails (e.g in the underlying datastore)
>> then this will throw
>> * a JDOException.
>> - * @since 2.3
>> + * @since 3.0
>> */
>> void cancelAll();
>>
>> @@ -775,7 +775,7 @@
>> * throw JDOUnsupportedOptionException.
>> * If the cancellation fails (e.g in the underlying datastore)
>> then this will throw
>> * a JDOException.
>> - * @since 2.3
>> + * @since 3.0
>> */
>> void cancel(Thread thread);
>>
>> @@ -785,14 +785,14 @@
>> * <P>If <code>false</code> then retrieved objects will not be
>> locked.
>> * If null will fallback to the value for metadata for the
>> class in question.
>> * @param serialize the value of the serializeRead property
>> - * @since 2.3
>> + * @since 3.0
>> */
>> void setSerializeRead(Boolean serialize);
>>
>> /**
>> * Return the current value of the serializeRead property.
>> * @return the value of the serializeRead property
>> - * @since 2.3
>> + * @since 3.0
>> */
>> Boolean getSerializeRead();
>> }
>> Index: api/src/java/javax/jdo/JDOQueryInterruptedException.java
>> ===================================================================
>> --- api/src/java/javax/jdo/JDOQueryInterruptedException.java
>> (Revision 946329)
>> +++ api/src/java/javax/jdo/JDOQueryInterruptedException.java
>> (Arbeitskopie)
>> @@ -25,7 +25,7 @@
>> * This class represents exceptions caused when a query is
>> cancelled by a user calling
>> * Query.cancel().
>> *
>> - * @since 2.3
>> + * @since 3.0
>> */
>> public class JDOQueryInterruptedException extends JDOUserException {
>> /**
>> Index: api/src/java/javax/jdo/Constants.java
>> ===================================================================
>> --- api/src/java/javax/jdo/Constants.java (Revision 946329)
>> +++ api/src/java/javax/jdo/Constants.java (Arbeitskopie)
>> @@ -39,7 +39,7 @@
>> * The name of the standard service configuration resource text
>> file containing
>> * the name of an enhancer of {@link JDOEnhancer}.
>> * Constant value is <code>META-INF/services/
>> javax.jdo.JDOEnhancer</code>.
>> - * @since 2.3
>> + * @since 3.0
>> */
>> static String SERVICE_LOOKUP_ENHANCER_RESOURCE_NAME
>> = "META-INF/services/javax.jdo.JDOEnhancer";
>> @@ -270,7 +270,7 @@
>> * The name of the persistence manager factory element's
>> * "datastore-read-timeout-millis" attribute.
>> *
>> - * @since 2.3
>> + * @since 3.0
>> */
>> static String PMF_ATTRIBUTE_DATASTORE_READ_TIMEOUT_MILLIS
>> = "datastore-read-timeout-millis";
>> @@ -278,7 +278,7 @@
>> * The name of the persistence manager factory element's
>> * "datastore-write-timeout-millis" attribute.
>> *
>> - * @since 2.3
>> + * @since 3.0
>> */
>> static String PMF_ATTRIBUTE_DATASTORE_WRITE_TIMEOUT_MILLIS
>> = "datastore-write-timeout-millis";
>> @@ -485,7 +485,7 @@
>> * "javax.jdo.option.QueryCancel"
>> *
>> * @see PersistenceManagerFactory#supportedOptions()
>> - * @since 2.3
>> + * @since 3.0
>> */
>> static String OPTION_QUERY_CANCEL
>> = "javax.jdo.option.QueryCancel";
>> @@ -493,7 +493,7 @@
>> * "javax.jdo.option.DatastoreTimeout"
>> *
>> * @see PersistenceManagerFactory#supportedOptions()
>> - * @since 2.3
>> + * @since 3.0
>> */
>> static String OPTION_DATASTORE_TIMEOUT
>> = "javax.jdo.option.DatastoreTimeout";
>> @@ -591,7 +591,7 @@
>> * "VendorName"
>> *
>> * @see JDOEnhancer#getProperties()
>> - * @since 2.3
>> + * @since 3.0
>> */
>> public final static String PROPERTY_ENHANCER_VENDOR_NAME
>> = "VendorName";
>> @@ -600,23 +600,23 @@
>> * "VersionNumber"
>> *
>> * @see JDOEnhancer#getProperties()
>> - * @since 2.3
>> + * @since 3.0
>> */
>> public final static String PROPERTY_ENHANCER_VERSION_NUMBER
>> = "VersionNumber";
>>
>> /** Exit value for no enhancer found
>> - * @since 2.3
>> + * @since 3.0
>> * */
>> public final static int ENHANCER_NO_JDO_ENHANCER_FOUND = 2;
>>
>> /** Exit value for usage error
>> - * @since 2.3
>> + * @since 3.0
>> * */
>> public final static int ENHANCER_USAGE_ERROR = 3;
>>
>> /** Exit value for an exception from the JDOEnhancer
>> - * @since 2.3
>> + * @since 3.0
>> * */
>> public final static int ENHANCER_EXCEPTION = 1;
>>
>> @@ -885,7 +885,7 @@
>> /**
>> * Specified value "javax.jdo.option.DatastoreReadTimeoutMillis"
>> *
>> - * @since 2.3
>> + * @since 3.0
>> */
>> static String PROPERTY_DATASTORE_READ_TIMEOUT_MILLIS
>> = "javax.jdo.option.DatastoreReadTimeoutMillis";
>> @@ -893,7 +893,7 @@
>> /**
>> * Specified value "javax.jdo.option.DatastoreWriteTimeoutMillis"
>> *
>> - * @since 2.3
>> + * @since 3.0
>> */
>> static String PROPERTY_DATASTORE_WRITE_TIMEOUT_MILLIS
>> = "javax.jdo.option.DatastoreWriteTimeoutMillis";
>> Index: api/src/java/javax/jdo/JDOHelper.java
>> ===================================================================
>> --- api/src/java/javax/jdo/JDOHelper.java (Revision 946329)
>> +++ api/src/java/javax/jdo/JDOHelper.java (Arbeitskopie)
>> @@ -1837,7 +1837,7 @@
>> * "META-INF/services/JDOEnhancer" using the context class
>> loader.
>> * @return the <code>JDOEnhancer</code>.
>> * @throws JDOFatalUserException if no available enhancer
>> - * @since 2.3
>> + * @since 3.0
>> */
>> public static JDOEnhancer getEnhancer() {
>> return getEnhancer(getContextClassLoader());
>> @@ -1849,7 +1849,7 @@
>> * @param loader the loader to use for loading the JDOEnhancer
>> class (if any)
>> * @return the <code>JDOEnhancer</code>.
>> * @throws JDOFatalUserException if no available enhancer
>> - * @since 2.3
>> + * @since 3.0
>> */
>> public static JDOEnhancer getEnhancer(ClassLoader loader) {
>> ClassLoader ctrLoader = loader;
>> Index: api/src/java/javax/jdo/annotations/PersistenceCapable.java
>> ===================================================================
>> --- api/src/java/javax/jdo/annotations/PersistenceCapable.java
>> (Revision 946329)
>> +++ api/src/java/javax/jdo/annotations/PersistenceCapable.java
>> (Arbeitskopie)
>> @@ -76,7 +76,7 @@
>> String cacheable() default "true";
>>
>> /** Whether objects of this type should, by default, be locked
>> when read.
>> - * @since 2.3
>> + * @since 3.0
>> */
>> String serializeRead() default "false";
>>
>> Index: api/src/java/javax/jdo/JDOEnhanceException.java
>> ===================================================================
>> --- api/src/java/javax/jdo/JDOEnhanceException.java (Revision 946329)
>> +++ api/src/java/javax/jdo/JDOEnhanceException.java (Arbeitskopie)
>> @@ -18,7 +18,7 @@
>>
>> /**
>> * Exception thrown when an error occurs during enhancement.
>> - * @since 2.3
>> + * @since 3.0
>> */
>> public class JDOEnhanceException extends JDOException
>> {
>> Index: api/src/java/javax/jdo/Transaction.java
>> ===================================================================
>> --- api/src/java/javax/jdo/Transaction.java (Revision 946329)
>> +++ api/src/java/javax/jdo/Transaction.java (Arbeitskopie)
>> @@ -38,7 +38,7 @@
>> * environment. When used in a managed environment, transaction
>> initiation
>> * and completion methods may only be used with bean-managed
>> transaction
>> * semantics.
>> - * @version 2.3
>> + * @version 3.0
>> */
>> public interface Transaction
>> {
>> @@ -235,14 +235,14 @@
>> * <P>If <code>false</code> then retrieved objects will not be
>> locked.
>> * If null will fallback to the value for metadata for the
>> class in question.
>> * @param serialize the value of the serializeRead property
>> - * @since 2.3
>> + * @since 3.0
>> */
>> void setSerializeRead(Boolean serialize);
>>
>> /**
>> * Return the current value of the serializeRead property.
>> * @return the value of the serializeRead property
>> - * @since 2.3
>> + * @since 3.0
>> */
>> Boolean getSerializeRead();
>> }
>> Index: api/src/java/javax/jdo/metadata/DatastoreIdentityMetadata.java
>> ===================================================================
>> --- api/src/java/javax/jdo/metadata/DatastoreIdentityMetadata.java
>> (Revision 946329)
>> +++ api/src/java/javax/jdo/metadata/DatastoreIdentityMetadata.java
>> (Arbeitskopie)
>> @@ -20,7 +20,7 @@
>>
>> /**
>> * Represents the datastore identity of a class.
>> - * @since 2.3
>> + * @since 3.0
>> */
>> public interface DatastoreIdentityMetadata extends Metadata {
>> /**
>> @@ -99,4 +99,4 @@
>> * @return The number of columns
>> */
>> int getNumberOfColumns();
>> -}
>> \ No newline at end of file
>> +}
>> Index: api/src/java/javax/jdo/metadata/ForeignKeyMetadata.java
>> ===================================================================
>> --- api/src/java/javax/jdo/metadata/ForeignKeyMetadata.java
>> (Revision 946329)
>> +++ api/src/java/javax/jdo/metadata/ForeignKeyMetadata.java
>> (Arbeitskopie)
>> @@ -20,7 +20,7 @@
>>
>> /**
>> * Represents a FK constraint in an ORM context.
>> - * @since 2.3
>> + * @since 3.0
>> */
>> public interface ForeignKeyMetadata extends Metadata {
>> /**
>> @@ -155,4 +155,4 @@
>> * @return The PropertyMetadata
>> */
>> PropertyMetadata newPropertyMetadata(String name);
>> -}
>> \ No newline at end of file
>> +}
>> Index: api/src/java/javax/jdo/metadata/ClassMetadata.java
>> ===================================================================
>> --- api/src/java/javax/jdo/metadata/ClassMetadata.java (Revision
>> 946329)
>> +++ api/src/java/javax/jdo/metadata/ClassMetadata.java (Arbeitskopie)
>> @@ -20,7 +20,7 @@
>>
>> /**
>> * Represents a class.
>> - * @since 2.3
>> + * @since 3.0
>> */
>> public interface ClassMetadata extends TypeMetadata {
>> /**
>> @@ -48,4 +48,4 @@
>> * @return The FieldMetadata
>> */
>> FieldMetadata newFieldMetadata(Field fld);
>> -}
>> \ No newline at end of file
>> +}
>> Index: api/src/java/javax/jdo/metadata/DiscriminatorMetadata.java
>> ===================================================================
>> --- api/src/java/javax/jdo/metadata/DiscriminatorMetadata.java
>> (Revision 946329)
>> +++ api/src/java/javax/jdo/metadata/DiscriminatorMetadata.java
>> (Arbeitskopie)
>> @@ -20,7 +20,7 @@
>>
>> /**
>> * Represents the discriminator for inheritance purposes for this
>> class.
>> - * @since 2.3
>> + * @since 3.0
>> */
>> public interface DiscriminatorMetadata extends Metadata {
>> /**
>> @@ -113,4 +113,4 @@
>> * @return Index metadata
>> */
>> IndexMetadata getIndexMetadata();
>> -}
>> \ No newline at end of file
>> +}
>> Index: api/src/java/javax/jdo/metadata/IndexMetadata.java
>> ===================================================================
>> --- api/src/java/javax/jdo/metadata/IndexMetadata.java (Revision
>> 946329)
>> +++ api/src/java/javax/jdo/metadata/IndexMetadata.java (Arbeitskopie)
>> @@ -18,7 +18,7 @@
>>
>> /**
>> * Represents an index.
>> - * @since 2.3
>> + * @since 3.0
>> */
>> public interface IndexMetadata extends Metadata {
>> /**
>> @@ -113,4 +113,4 @@
>> * @return The PropertyMetadata
>> */
>> PropertyMetadata newPropertyMetadata(String name);
>> -}
>> \ No newline at end of file
>> +}
>> Index: api/src/java/javax/jdo/metadata/SequenceMetadata.java
>> ===================================================================
>> --- api/src/java/javax/jdo/metadata/SequenceMetadata.java (Revision
>> 946329)
>> +++ api/src/java/javax/jdo/metadata/SequenceMetadata.java
>> (Arbeitskopie)
>> @@ -20,7 +20,7 @@
>>
>> /**
>> * Represents a sequence.
>> - * @since 2.3
>> + * @since 3.0
>> */
>> public interface SequenceMetadata extends Metadata {
>> /**
>> @@ -64,4 +64,4 @@
>> * @return The factory class
>> */
>> String getFactoryClass();
>> -}
>> \ No newline at end of file
>> +}
>> Index: api/src/java/javax/jdo/metadata/OrderMetadata.java
>> ===================================================================
>> --- api/src/java/javax/jdo/metadata/OrderMetadata.java (Revision
>> 946329)
>> +++ api/src/java/javax/jdo/metadata/OrderMetadata.java (Arbeitskopie)
>> @@ -18,7 +18,7 @@
>>
>> /**
>> * Represents ordering of a collection field/property.
>> - * @since 2.3
>> + * @since 3.0
>> */
>> public interface OrderMetadata extends Metadata {
>> /**
>> @@ -83,4 +83,4 @@
>> * @return Index metadata
>> */
>> IndexMetadata getIndexMetadata();
>> -}
>> \ No newline at end of file
>> +}
>> Index: api/src/java/javax/jdo/metadata/ValueMetadata.java
>> ===================================================================
>> --- api/src/java/javax/jdo/metadata/ValueMetadata.java (Revision
>> 946329)
>> +++ api/src/java/javax/jdo/metadata/ValueMetadata.java (Arbeitskopie)
>> @@ -20,7 +20,7 @@
>>
>> /**
>> * Represents a value in a map.
>> - * @since 2.3
>> + * @since 3.0
>> */
>> public interface ValueMetadata extends Metadata {
>> /**
>> @@ -148,4 +148,4 @@
>> * @return The ForeignKeyMetadata
>> */
>> ForeignKeyMetadata getForeignKeyMetadata();
>> -}
>> \ No newline at end of file
>> +}
>> Index: api/src/java/javax/jdo/metadata/TypeMetadata.java
>> ===================================================================
>> --- api/src/java/javax/jdo/metadata/TypeMetadata.java (Revision
>> 946329)
>> +++ api/src/java/javax/jdo/metadata/TypeMetadata.java (Arbeitskopie)
>> @@ -22,7 +22,7 @@
>>
>> /**
>> * Represents a class or interface. Extended for the specifics of
>> those cases.
>> - * @since 2.3
>> + * @since 3.0
>> */
>> public interface TypeMetadata extends Metadata {
>> /**
>> @@ -407,4 +407,4 @@
>> * @return The number of columns
>> */
>> int getNumberOfColumns();
>> -}
>> \ No newline at end of file
>> +}
>> Index: api/src/java/javax/jdo/metadata/InheritanceMetadata.java
>> ===================================================================
>> --- api/src/java/javax/jdo/metadata/InheritanceMetadata.java
>> (Revision 946329)
>> +++ api/src/java/javax/jdo/metadata/InheritanceMetadata.java
>> (Arbeitskopie)
>> @@ -20,7 +20,7 @@
>>
>> /**
>> * Represents the inheritance of a class.
>> - * @since 2.3
>> + * @since 3.0
>> */
>> public interface InheritanceMetadata extends Metadata {
>> /**
>> @@ -78,4 +78,4 @@
>> * @return Join information
>> */
>> JoinMetadata getJoinMetadata();
>> -}
>> \ No newline at end of file
>> +}
>> Index: api/src/java/javax/jdo/metadata/ElementMetadata.java
>> ===================================================================
>> --- api/src/java/javax/jdo/metadata/ElementMetadata.java (Revision
>> 946329)
>> +++ api/src/java/javax/jdo/metadata/ElementMetadata.java
>> (Arbeitskopie)
>> @@ -20,7 +20,7 @@
>>
>> /**
>> * Represents an element in a collection/array.
>> - * @since 2.3
>> + * @since 3.0
>> */
>> public interface ElementMetadata extends Metadata {
>> /**
>> @@ -155,4 +155,4 @@
>> * @return The ForeignKeyMetadata
>> */
>> ForeignKeyMetadata getForeignKeyMetadata();
>> -}
>> \ No newline at end of file
>> +}
>> Index: api/src/java/javax/jdo/metadata/CollectionMetadata.java
>> ===================================================================
>> --- api/src/java/javax/jdo/metadata/CollectionMetadata.java
>> (Revision 946329)
>> +++ api/src/java/javax/jdo/metadata/CollectionMetadata.java
>> (Arbeitskopie)
>> @@ -18,7 +18,7 @@
>>
>> /**
>> * Represents details of a collection in a field/property in a class.
>> - * @since 2.3
>> + * @since 3.0
>> */
>> public interface CollectionMetadata extends Metadata {
>> /**
>> @@ -76,4 +76,4 @@
>> * @return whether the element is dependent
>> */
>> Boolean getDependentElement();
>> -}
>> \ No newline at end of file
>> +}
>> Index: api/src/java/javax/jdo/metadata/PrimaryKeyMetadata.java
>> ===================================================================
>> --- api/src/java/javax/jdo/metadata/PrimaryKeyMetadata.java
>> (Revision 946329)
>> +++ api/src/java/javax/jdo/metadata/PrimaryKeyMetadata.java
>> (Arbeitskopie)
>> @@ -18,7 +18,7 @@
>>
>> /**
>> * Represents the primary key definition of a class.
>> - * @since 2.3
>> + * @since 3.0
>> */
>> public interface PrimaryKeyMetadata extends Metadata {
>> /**
>> @@ -71,4 +71,4 @@
>> * @return The number of columns
>> */
>> int getNumberOfColumns();
>> -}
>> \ No newline at end of file
>> +}
>> Index: api/src/java/javax/jdo/metadata/ColumnMetadata.java
>> ===================================================================
>> --- api/src/java/javax/jdo/metadata/ColumnMetadata.java (Revision
>> 946329)
>> +++ api/src/java/javax/jdo/metadata/ColumnMetadata.java
>> (Arbeitskopie)
>> @@ -18,7 +18,7 @@
>>
>> /**
>> * Represents an element in a collection/array.
>> - * @since 2.3
>> + * @since 3.0
>> */
>> public interface ColumnMetadata extends Metadata {
>> /**
>> @@ -160,4 +160,4 @@
>> * @return Insert value
>> */
>> String getInsertValue();
>> -}
>> \ No newline at end of file
>> +}
>> Index: api/src/java/javax/jdo/metadata/JoinMetadata.java
>> ===================================================================
>> --- api/src/java/javax/jdo/metadata/JoinMetadata.java (Revision
>> 946329)
>> +++ api/src/java/javax/jdo/metadata/JoinMetadata.java (Arbeitskopie)
>> @@ -20,7 +20,7 @@
>>
>> /**
>> * Represents join information.
>> - * @since 2.3
>> + * @since 3.0
>> */
>> public interface JoinMetadata extends Metadata {
>> /**
>> @@ -183,4 +183,4 @@
>> * @return The number of columns
>> */
>> int getNumberOfColumns();
>> -}
>> \ No newline at end of file
>> +}
>> Index: api/src/java/javax/jdo/metadata/InterfaceMetadata.java
>> ===================================================================
>> --- api/src/java/javax/jdo/metadata/InterfaceMetadata.java
>> (Revision 946329)
>> +++ api/src/java/javax/jdo/metadata/InterfaceMetadata.java
>> (Arbeitskopie)
>> @@ -18,8 +18,8 @@
>>
>> /**
>> * Represents a persistent-interface.
>> - * @since 2.3
>> + * @since 3.0
>> */
>> public interface InterfaceMetadata extends TypeMetadata {
>>
>> -}
>> \ No newline at end of file
>> +}
>> Index: api/src/java/javax/jdo/metadata/FetchPlanMetadata.java
>> ===================================================================
>> --- api/src/java/javax/jdo/metadata/FetchPlanMetadata.java
>> (Revision 946329)
>> +++ api/src/java/javax/jdo/metadata/FetchPlanMetadata.java
>> (Arbeitskopie)
>> @@ -18,7 +18,7 @@
>>
>> /**
>> * Represents a fetch plan for a class.
>> - * @since 2.3
>> + * @since 3.0
>> */
>> public interface FetchPlanMetadata extends Metadata {
>> /**
>> @@ -77,4 +77,4 @@
>> * @return The number of fetch groups
>> */
>> int getNumberOfFetchGroups();
>> -}
>> \ No newline at end of file
>> +}
>> Index: api/src/java/javax/jdo/metadata/QueryMetadata.java
>> ===================================================================
>> --- api/src/java/javax/jdo/metadata/QueryMetadata.java (Revision
>> 946329)
>> +++ api/src/java/javax/jdo/metadata/QueryMetadata.java (Arbeitskopie)
>> @@ -18,7 +18,7 @@
>>
>> /**
>> * Represents a named query.
>> - * @since 2.3
>> + * @since 3.0
>> */
>> public interface QueryMetadata extends Metadata {
>> /**
>> @@ -109,4 +109,4 @@
>> * @return The fetch plan name
>> */
>> String getFetchPlan();
>> -}
>> \ No newline at end of file
>> +}
>> Index: api/src/java/javax/jdo/metadata/FetchGroupMetadata.java
>> ===================================================================
>> --- api/src/java/javax/jdo/metadata/FetchGroupMetadata.java
>> (Revision 946329)
>> +++ api/src/java/javax/jdo/metadata/FetchGroupMetadata.java
>> (Arbeitskopie)
>> @@ -18,7 +18,7 @@
>>
>> /**
>> * Represents a fetch group for a class.
>> - * @since 2.3
>> + * @since 3.0
>> */
>> public interface FetchGroupMetadata extends Metadata {
>> /**
>> @@ -70,4 +70,4 @@
>> * @return The PropertyMetadata
>> */
>> PropertyMetadata newPropertyMetadata(String name);
>> -}
>> \ No newline at end of file
>> +}
>> Index: api/src/java/javax/jdo/metadata/UniqueMetadata.java
>> ===================================================================
>> --- api/src/java/javax/jdo/metadata/UniqueMetadata.java (Revision
>> 946329)
>> +++ api/src/java/javax/jdo/metadata/UniqueMetadata.java
>> (Arbeitskopie)
>> @@ -18,7 +18,7 @@
>>
>> /**
>> * Represents a unique constraint.
>> - * @since 2.3
>> + * @since 3.0
>> */
>> public interface UniqueMetadata extends Metadata {
>> /**
>> @@ -111,4 +111,4 @@
>> * @return The PropertyMetadata
>> */
>> PropertyMetadata newPropertyMetadata(String name);
>> -}
>> \ No newline at end of file
>> +}
>> Index: api/src/java/javax/jdo/metadata/MemberMetadata.java
>> ===================================================================
>> --- api/src/java/javax/jdo/metadata/MemberMetadata.java (Revision
>> 946329)
>> +++ api/src/java/javax/jdo/metadata/MemberMetadata.java
>> (Arbeitskopie)
>> @@ -23,7 +23,7 @@
>>
>> /**
>> * Represents a field/property in a class/persistent-interface.
>> - * @since 2.3
>> + * @since 3.0
>> */
>> public interface MemberMetadata extends Metadata {
>> /**
>> @@ -510,4 +510,4 @@
>> * @return The number of columns
>> */
>> int getNumberOfColumns();
>> -}
>> \ No newline at end of file
>> +}
>> Index: api/src/java/javax/jdo/metadata/ExtensionMetadata.java
>> ===================================================================
>> --- api/src/java/javax/jdo/metadata/ExtensionMetadata.java
>> (Revision 946329)
>> +++ api/src/java/javax/jdo/metadata/ExtensionMetadata.java
>> (Arbeitskopie)
>> @@ -19,7 +19,7 @@
>> /**
>> * A vendor extension defined in Metadata.
>> *
>> - * @version 2.3
>> + * @version 3.0
>> */
>> public interface ExtensionMetadata {
>> /**
>> @@ -39,4 +39,4 @@
>> * @return The value
>> */
>> String getValue();
>> -}
>> \ No newline at end of file
>> +}
>> Index: api/src/java/javax/jdo/metadata/JDOMetadata.java
>> ===================================================================
>> --- api/src/java/javax/jdo/metadata/JDOMetadata.java (Revision
>> 946329)
>> +++ api/src/java/javax/jdo/metadata/JDOMetadata.java (Arbeitskopie)
>> @@ -18,7 +18,7 @@
>>
>> /**
>> * Represents the top-level JDO metadata.
>> - * @since 2.3
>> + * @since 3.0
>> */
>> public interface JDOMetadata extends Metadata {
>> /**
>> @@ -144,4 +144,4 @@
>> * @return The number of fetch plans.
>> */
>> int getNumberOfFetchPlans();
>> -}
>> \ No newline at end of file
>> +}
>> Index: api/src/java/javax/jdo/metadata/MapMetadata.java
>> ===================================================================
>> --- api/src/java/javax/jdo/metadata/MapMetadata.java (Revision
>> 946329)
>> +++ api/src/java/javax/jdo/metadata/MapMetadata.java (Arbeitskopie)
>> @@ -18,7 +18,7 @@
>>
>> /**
>> * Represents details of a map in a field/property in a class.
>> - * @since 2.3
>> + * @since 3.0
>> */
>> public interface MapMetadata extends Metadata {
>> /**
>> @@ -132,4 +132,4 @@
>> * @return whether the value is dependent
>> */
>> Boolean getDependentValue();
>> -}
>> \ No newline at end of file
>> +}
>> Index: api/src/java/javax/jdo/metadata/ArrayMetadata.java
>> ===================================================================
>> --- api/src/java/javax/jdo/metadata/ArrayMetadata.java (Revision
>> 946329)
>> +++ api/src/java/javax/jdo/metadata/ArrayMetadata.java (Arbeitskopie)
>> @@ -18,7 +18,7 @@
>>
>> /**
>> * Represents details of an array in a field/property in a class.
>> - * @since 2.3
>> + * @since 3.0
>> */
>> public interface ArrayMetadata extends Metadata {
>> /**
>> @@ -76,4 +76,4 @@
>> * @return whether the element is dependent
>> */
>> Boolean getDependentElement();
>> -}
>> \ No newline at end of file
>> +}
>> Index: api/src/java/javax/jdo/metadata/Indexed.java
>> ===================================================================
>> --- api/src/java/javax/jdo/metadata/Indexed.java (Revision 946329)
>> +++ api/src/java/javax/jdo/metadata/Indexed.java (Arbeitskopie)
>> @@ -19,8 +19,8 @@
>> /**
>> * Enumeration of the indexed values.
>> *
>> - * @version 2.3
>> - * @since 2.3
>> + * @version 3.0
>> + * @since 3.0
>> */
>> public enum Indexed
>> {
>> Index: api/src/java/javax/jdo/metadata/Metadata.java
>> ===================================================================
>> --- api/src/java/javax/jdo/metadata/Metadata.java (Revision 946329)
>> +++ api/src/java/javax/jdo/metadata/Metadata.java (Arbeitskopie)
>> @@ -19,7 +19,7 @@
>> /**
>> * This interface provides base level definitions for all metadata
>> components.
>> *
>> - * @version 2.3
>> + * @version 3.0
>> */
>> public interface Metadata {
>> /**
>> @@ -52,4 +52,4 @@
>> * @return The parent
>> */
>> Metadata getParent();
>> -}
>> \ No newline at end of file
>> +}
>> Index: api/src/java/javax/jdo/metadata/FieldMetadata.java
>> ===================================================================
>> --- api/src/java/javax/jdo/metadata/FieldMetadata.java (Revision
>> 946329)
>> +++ api/src/java/javax/jdo/metadata/FieldMetadata.java (Arbeitskopie)
>> @@ -18,8 +18,8 @@
>>
>> /**
>> * Represents a field in a class.
>> - * @since 2.3
>> + * @since 3.0
>> */
>> public interface FieldMetadata extends MemberMetadata {
>>
>> -}
>> \ No newline at end of file
>> +}
>> Index: api/src/java/javax/jdo/metadata/PropertyMetadata.java
>> ===================================================================
>> --- api/src/java/javax/jdo/metadata/PropertyMetadata.java (Revision
>> 946329)
>> +++ api/src/java/javax/jdo/metadata/PropertyMetadata.java
>> (Arbeitskopie)
>> @@ -18,7 +18,7 @@
>>
>> /**
>> * Represents a property in a class/persistent-interface.
>> - * @since 2.3
>> + * @since 3.0
>> */
>> public interface PropertyMetadata extends MemberMetadata {
>> /**
>> @@ -34,4 +34,4 @@
>> * @return Field name
>> */
>> String getFieldName();
>> -}
>> \ No newline at end of file
>> +}
>> Index: api/src/java/javax/jdo/metadata/VersionMetadata.java
>> ===================================================================
>> --- api/src/java/javax/jdo/metadata/VersionMetadata.java (Revision
>> 946329)
>> +++ api/src/java/javax/jdo/metadata/VersionMetadata.java
>> (Arbeitskopie)
>> @@ -20,7 +20,7 @@
>>
>> /**
>> * Represents versioning of a class.
>> - * @since 2.3
>> + * @since 3.0
>> */
>> public interface VersionMetadata extends Metadata {
>> /**
>> @@ -99,4 +99,4 @@
>> * @return Index metadata
>> */
>> IndexMetadata getIndexMetadata();
>> -}
>> \ No newline at end of file
>> +}
>> Index: api/src/java/javax/jdo/metadata/ClassPersistenceModifier.java
>> ===================================================================
>> --- api/src/java/javax/jdo/metadata/ClassPersistenceModifier.java
>> (Revision 946329)
>> +++ api/src/java/javax/jdo/metadata/ClassPersistenceModifier.java
>> (Arbeitskopie)
>> @@ -18,7 +18,7 @@
>>
>> /**
>> * Enumeration of the persistence-modifier values for a class.
>> - * @since 2.3
>> + * @since 3.0
>> */
>> public enum ClassPersistenceModifier
>> {
>> Index: api/src/java/javax/jdo/metadata/EmbeddedMetadata.java
>> ===================================================================
>> --- api/src/java/javax/jdo/metadata/EmbeddedMetadata.java (Revision
>> 946329)
>> +++ api/src/java/javax/jdo/metadata/EmbeddedMetadata.java
>> (Arbeitskopie)
>> @@ -18,7 +18,7 @@
>>
>> /**
>> * Represents embedding details of a field/property in a class.
>> - * @since 2.3
>> + * @since 3.0
>> */
>> public interface EmbeddedMetadata extends Metadata {
>> /**
>> @@ -92,4 +92,4 @@
>> * @return The PropertyMetadata
>> */
>> PropertyMetadata newPropertyMetadata(String name);
>> -}
>> \ No newline at end of file
>> +}
>> Index: api/src/java/javax/jdo/metadata/PackageMetadata.java
>> ===================================================================
>> --- api/src/java/javax/jdo/metadata/PackageMetadata.java (Revision
>> 946329)
>> +++ api/src/java/javax/jdo/metadata/PackageMetadata.java
>> (Arbeitskopie)
>> @@ -20,7 +20,7 @@
>>
>> /**
>> * Represents a package within a JDOMetadata.
>> - * @since 2.3
>> + * @since 3.0
>> */
>> public interface PackageMetadata extends Metadata {
>> /**
>> @@ -141,4 +141,4 @@
>> * @return The number of sequences.
>> */
>> int getNumberOfSequences();
>> -}
>> \ No newline at end of file
>> +}
>> Index: api/src/java/javax/jdo/PersistenceManagerFactory.java
>> ===================================================================
>> --- api/src/java/javax/jdo/PersistenceManagerFactory.java (Revision
>> 946329)
>> +++ api/src/java/javax/jdo/PersistenceManagerFactory.java
>> (Arbeitskopie)
>> @@ -529,7 +529,7 @@
>> * javax.jdo.option.DatastoreTimeout is returned by
>> supportedOptions().
>> * If timeouts are not supported,this method will throw
>> * JDOUnsupportedOptionException.
>> - * @since 2.3
>> + * @since 3.0
>> * @param interval the timeout interval (milliseconds)
>> */
>> void setDatastoreReadTimeoutMillis(Integer interval);
>> @@ -538,7 +538,7 @@
>> * If timeouts are not supported,this method will return null.
>> * @see #setDatastoreReadTimeoutMillis(Integer)
>> * @return the default timeout setting (milliseconds).
>> - * @since 2.3
>> + * @since 3.0
>> */
>> Integer getDatastoreReadTimeoutMillis();
>>
>> @@ -551,7 +551,7 @@
>> * javax.jdo.option.DatastoreTimeout is returned by
>> supportedOptions().
>> * If timeouts are not supported,this method will throw
>> * JDOUnsupportedOptionException.
>> - * @since 2.3
>> + * @since 3.0
>> * @param interval the timeout interval (milliseconds)
>> */
>> void setDatastoreWriteTimeoutMillis(Integer interval);
>> @@ -560,7 +560,7 @@
>> * If timeouts are not supported,this method will return null.
>> * @see #setDatastoreWriteTimeoutMillis(Integer)
>> * @return the default timeout setting (milliseconds).
>> - * @since 2.3
>> + * @since 3.0
>> */
>> Integer getDatastoreWriteTimeoutMillis();
>>
>> @@ -756,7 +756,7 @@
>> * If there is already metadata registered for a class
>> contained in this metadata
>> * object then a JDOUserException will be thrown.
>> * @param metadata The Metadata to register.
>> - * @since 2.3
>> + * @since 3.0
>> */
>> void registerMetadata(JDOMetadata metadata);
>>
>> @@ -764,7 +764,7 @@
>> * Method to return a new metadata object that can be
>> subsequently modified
>> * and registered with the persistence process using the method
>> {@link #registerMetadata}.
>> * @return The metadata
>> - * @since 2.3
>> + * @since 3.0
>> */
>> JDOMetadata newMetadata();
>>
>> @@ -774,7 +774,7 @@
>> * If there is no metadata for the specified class/interface,
>> or the parameter is null,
>> * then null will be returned.
>> * @return The metadata
>> - * @since 2.3
>> + * @since 3.0
>> */
>> TypeMetadata getMetadata(String className);
>> }
>> Index: api/src/java/javax/jdo/PersistenceManager.java
>> ===================================================================
>> --- api/src/java/javax/jdo/PersistenceManager.java (Revision 946329)
>> +++ api/src/java/javax/jdo/PersistenceManager.java (Arbeitskopie)
>> @@ -971,7 +971,7 @@
>> * PersistenceManagerFactory.supportedOptions().
>> * If timeouts are not supported,this method will throw
>> * JDOUnsupportedOptionException.
>> - * @since 2.3
>> + * @since 3.0
>> * @param interval the timeout interval (milliseconds)
>> */
>> void setDatastoreReadTimeoutMillis(Integer interval);
>> @@ -984,7 +984,7 @@
>> * @see #setDatastoreReadTimeoutMillis(Integer)
>> * @see
>> PersistenceManagerFactory#setDatastoreReadTimeoutMillis(Integer)
>> * @return the effective timeout setting (milliseconds).
>> - * @since 2.3
>> + * @since 3.0
>> */
>> Integer getDatastoreReadTimeoutMillis();
>>
>> @@ -1006,7 +1006,7 @@
>> * PersistenceManagerFactory.supportedOptions().
>> * If timeouts are not supported,this method will throw
>> * JDOUnsupportedOptionException.
>> - * @since 2.3
>> + * @since 3.0
>> * @param interval the timeout interval (milliseconds)
>> */
>> void setDatastoreWriteTimeoutMillis(Integer interval);
>> @@ -1018,7 +1018,7 @@
>> * @see #setDatastoreWriteTimeoutMillis(Integer)
>> * @see
>> PersistenceManagerFactory#setDatastoreWriteTimeoutMillis(Integer)
>> * @return the effective timeout setting (milliseconds).
>> - * @since 2.3
>> + * @since 3.0
>> */
>> Integer getDatastoreWriteTimeoutMillis();
>>
>> Index: api/src/java/javax/jdo/JDOEnhancer.java
>> ===================================================================
>> --- api/src/java/javax/jdo/JDOEnhancer.java (Revision 946329)
>> +++ api/src/java/javax/jdo/JDOEnhancer.java (Arbeitskopie)
>> @@ -23,7 +23,7 @@
>>
>> /**
>> * Interface for a JDO Enhancer.
>> - * @since 2.3
>> + * @since 3.0
>> */
>> public interface JDOEnhancer extends ClassFileTransformer
>> {
>> @@ -138,7 +138,7 @@
>> * If there is already metadata registered for a class
>> contained in this metadata
>> * object then a JDOUserException will be thrown.
>> * @param metadata The Metadata to register.
>> - * @since 2.3
>> + * @since 3.0
>> */
>> void registerMetadata(JDOMetadata metadata);
>>
>> @@ -146,7 +146,7 @@
>> * Method to return a new metadata object that can be
>> subsequently modified
>> * and registered with the enhancement process using the method
>> {@link #registerMetadata}.
>> * @return The metadata
>> - * @since 2.3
>> + * @since 3.0
>> */
>> JDOMetadata newMetadata();
>> -}
>> \ No newline at end of file
>> +}
>> Index: api/src/java/javax/jdo/Enhancer.java
>> ===================================================================
>> --- api/src/java/javax/jdo/Enhancer.java (Revision 946329)
>> +++ api/src/java/javax/jdo/Enhancer.java (Arbeitskopie)
>> @@ -65,7 +65,7 @@
>> * </li><li>Directories will be searched recursively if the -r
>> option is set
>> * </li></ul>
>> *
>> - * @since 2.3
>> + * @since 3.0
>> */
>> public class Enhancer {
>>
>> @@ -453,4 +453,4 @@
>> addVerboseMessage(msgId, String.valueOf(where));
>> }
>>
>> -}
>> \ No newline at end of file
>> +}
>
> Craig L Russell
> Architect, Oracle
> http://db.apache.org/jdo
> 408 276-5638 mailto:Craig.Russell@oracle.com
> P.S. A good JDO? O, Gasp!
>
Craig L Russell
Architect, Oracle
http://db.apache.org/jdo
408 276-5638 mailto:Craig.Russell@oracle.com
P.S. A good JDO? O, Gasp!
Re: New jdo projects in svn repo
Posted by Craig L Russell <cr...@oracle.com>.
Yes, please check in this change.
Regards,
Craig
On May 19, 2010, at 12:26 PM, Michael Bouschen wrote:
> Hi Craig,
>
> I see the same results as Andy.
>
> I propose a minor change in the api project: replace @since 2.3 by
> @since 3.0 in the javadoc. Attached you find a patch implementing
> the change. I can check it in, please let me know.
>
> Regards Michael
>
>> Hi Andy,
>>
>> I think I understand all of this and will fix shortly.
>>
>> Thanks,
>>
>> Craig
>>
>> On May 19, 2010, at 8:51 AM, Andy Jefferson wrote:
>>
>>
>>> Hi Craig,
>>>
>>>
>>>> I think these are pretty close to what we want to ship for the next
>>>> release. Can others please try the two projects and see if there
>>>> are
>>>> any issues?
>>>>
>>> api builds ok for me, but creates 2.3-SNAPSHOT (from parent
>>> project.xml) not
>>> 3.0-SNAPSHOT
>>>
>>> api/pom.xml has artifactId="jdo2-api" and name="JDO2 API".
>>> Should be "jdo-api" and "JDO API"
>>>
>>> api/project.xml has name="JDO2 API"
>>> Should be "JDO API"
>>>
>>>
>>>
>>> tck
>>> enhancement.conf gave
>>> [java] Cannot find test class
>>> 'org.apache.jdo.tck.enhancement.FieldAccessModified'.
>>> [java] Cannot find test class
>>> 'org.apache.jdo.tck.enhancement.ImplementsPersistenceCapable'.
>>> Maybe these are tests that shouldn't be run or something ?
>>>
>>>
>>>
>>>
>>>
>>> --
>>> Andy
>>> DataNucleus (http://www.datanucleus.org)
>>>
>>
>> Craig L Russell
>> Architect, Oracle
>> http://db.apache.org/jdo
>> 408 276-5638 mailto:Craig.Russell@oracle.com
>> P.S. A good JDO? O, Gasp!
>>
>>
>
>
> --
> Michael Bouschen
> Prokurist
>
> akquinet tech@spree GmbH
> Bülowstr. 66, D-10783 Berlin
>
> Fon: +49 30 235 520-33
> Fax: +49 30 217 520-12
> Email: michael.bouschen@akquinet.de
> Url: www.akquinet.de
>
> akquinet tech@spree GmbH, Berlin
> Geschäftsführung: Martin Weber, Prof. Dr. Christian Roth
> Amtsgericht Berlin-Charlottenburg HRB 86780 B
> USt.-Id. Nr.: DE 225 964 680
> Index: api/src/java/javax/jdo/Query.java
> ===================================================================
> --- api/src/java/javax/jdo/Query.java (Revision 946329)
> +++ api/src/java/javax/jdo/Query.java (Arbeitskopie)
> @@ -713,7 +713,7 @@
> * PersistenceManagerFactory.supportedOptions().
> * If timeouts are not supported,this method will throw
> * JDOUnsupportedOptionException.
> - * @since 2.3
> + * @since 3.0
> * @param interval the timeout interval (milliseconds)
> */
> void setDatastoreReadTimeoutMillis(Integer interval);
> @@ -724,7 +724,7 @@
> * @see #setDatastoreReadTimeoutMillis(Integer)
> * @see PersistenceManager#setDatastoreReadTimeoutMillis(Integer)
> * @return the effective timeout setting (milliseconds).
> - * @since 2.3
> + * @since 3.0
> */
> Integer getDatastoreReadTimeoutMillis();
>
> @@ -744,7 +744,7 @@
> * PersistenceManagerFactory.supportedOptions().
> * If timeouts are not supported,this method will throw
> * JDOUnsupportedOptionException.
> - * @since 2.3
> + * @since 3.0
> * @param interval the timeout interval (milliseconds)
> */
> void setDatastoreWriteTimeoutMillis(Integer interval);
> @@ -755,7 +755,7 @@
> * @see #setDatastoreWriteTimeoutMillis(Integer)
> * @see PersistenceManager#setDatastoreWriteTimeoutMillis(Integer)
> * @return the effective timeout setting (milliseconds).
> - * @since 2.3
> + * @since 3.0
> */
> Integer getDatastoreWriteTimeoutMillis();
>
> @@ -765,7 +765,7 @@
> * throw JDOUnsupportedOptionException.
> * If the cancellation fails (e.g in the underlying datastore)
> then this will throw
> * a JDOException.
> - * @since 2.3
> + * @since 3.0
> */
> void cancelAll();
>
> @@ -775,7 +775,7 @@
> * throw JDOUnsupportedOptionException.
> * If the cancellation fails (e.g in the underlying datastore)
> then this will throw
> * a JDOException.
> - * @since 2.3
> + * @since 3.0
> */
> void cancel(Thread thread);
>
> @@ -785,14 +785,14 @@
> * <P>If <code>false</code> then retrieved objects will not be
> locked.
> * If null will fallback to the value for metadata for the class
> in question.
> * @param serialize the value of the serializeRead property
> - * @since 2.3
> + * @since 3.0
> */
> void setSerializeRead(Boolean serialize);
>
> /**
> * Return the current value of the serializeRead property.
> * @return the value of the serializeRead property
> - * @since 2.3
> + * @since 3.0
> */
> Boolean getSerializeRead();
> }
> Index: api/src/java/javax/jdo/JDOQueryInterruptedException.java
> ===================================================================
> --- api/src/java/javax/jdo/JDOQueryInterruptedException.java
> (Revision 946329)
> +++ api/src/java/javax/jdo/JDOQueryInterruptedException.java
> (Arbeitskopie)
> @@ -25,7 +25,7 @@
> * This class represents exceptions caused when a query is cancelled
> by a user calling
> * Query.cancel().
> *
> - * @since 2.3
> + * @since 3.0
> */
> public class JDOQueryInterruptedException extends JDOUserException {
> /**
> Index: api/src/java/javax/jdo/Constants.java
> ===================================================================
> --- api/src/java/javax/jdo/Constants.java (Revision 946329)
> +++ api/src/java/javax/jdo/Constants.java (Arbeitskopie)
> @@ -39,7 +39,7 @@
> * The name of the standard service configuration resource text
> file containing
> * the name of an enhancer of {@link JDOEnhancer}.
> * Constant value is <code>META-INF/services/
> javax.jdo.JDOEnhancer</code>.
> - * @since 2.3
> + * @since 3.0
> */
> static String SERVICE_LOOKUP_ENHANCER_RESOURCE_NAME
> = "META-INF/services/javax.jdo.JDOEnhancer";
> @@ -270,7 +270,7 @@
> * The name of the persistence manager factory element's
> * "datastore-read-timeout-millis" attribute.
> *
> - * @since 2.3
> + * @since 3.0
> */
> static String PMF_ATTRIBUTE_DATASTORE_READ_TIMEOUT_MILLIS
> = "datastore-read-timeout-millis";
> @@ -278,7 +278,7 @@
> * The name of the persistence manager factory element's
> * "datastore-write-timeout-millis" attribute.
> *
> - * @since 2.3
> + * @since 3.0
> */
> static String PMF_ATTRIBUTE_DATASTORE_WRITE_TIMEOUT_MILLIS
> = "datastore-write-timeout-millis";
> @@ -485,7 +485,7 @@
> * "javax.jdo.option.QueryCancel"
> *
> * @see PersistenceManagerFactory#supportedOptions()
> - * @since 2.3
> + * @since 3.0
> */
> static String OPTION_QUERY_CANCEL
> = "javax.jdo.option.QueryCancel";
> @@ -493,7 +493,7 @@
> * "javax.jdo.option.DatastoreTimeout"
> *
> * @see PersistenceManagerFactory#supportedOptions()
> - * @since 2.3
> + * @since 3.0
> */
> static String OPTION_DATASTORE_TIMEOUT
> = "javax.jdo.option.DatastoreTimeout";
> @@ -591,7 +591,7 @@
> * "VendorName"
> *
> * @see JDOEnhancer#getProperties()
> - * @since 2.3
> + * @since 3.0
> */
> public final static String PROPERTY_ENHANCER_VENDOR_NAME
> = "VendorName";
> @@ -600,23 +600,23 @@
> * "VersionNumber"
> *
> * @see JDOEnhancer#getProperties()
> - * @since 2.3
> + * @since 3.0
> */
> public final static String PROPERTY_ENHANCER_VERSION_NUMBER
> = "VersionNumber";
>
> /** Exit value for no enhancer found
> - * @since 2.3
> + * @since 3.0
> * */
> public final static int ENHANCER_NO_JDO_ENHANCER_FOUND = 2;
>
> /** Exit value for usage error
> - * @since 2.3
> + * @since 3.0
> * */
> public final static int ENHANCER_USAGE_ERROR = 3;
>
> /** Exit value for an exception from the JDOEnhancer
> - * @since 2.3
> + * @since 3.0
> * */
> public final static int ENHANCER_EXCEPTION = 1;
>
> @@ -885,7 +885,7 @@
> /**
> * Specified value "javax.jdo.option.DatastoreReadTimeoutMillis"
> *
> - * @since 2.3
> + * @since 3.0
> */
> static String PROPERTY_DATASTORE_READ_TIMEOUT_MILLIS
> = "javax.jdo.option.DatastoreReadTimeoutMillis";
> @@ -893,7 +893,7 @@
> /**
> * Specified value "javax.jdo.option.DatastoreWriteTimeoutMillis"
> *
> - * @since 2.3
> + * @since 3.0
> */
> static String PROPERTY_DATASTORE_WRITE_TIMEOUT_MILLIS
> = "javax.jdo.option.DatastoreWriteTimeoutMillis";
> Index: api/src/java/javax/jdo/JDOHelper.java
> ===================================================================
> --- api/src/java/javax/jdo/JDOHelper.java (Revision 946329)
> +++ api/src/java/javax/jdo/JDOHelper.java (Arbeitskopie)
> @@ -1837,7 +1837,7 @@
> * "META-INF/services/JDOEnhancer" using the context class loader.
> * @return the <code>JDOEnhancer</code>.
> * @throws JDOFatalUserException if no available enhancer
> - * @since 2.3
> + * @since 3.0
> */
> public static JDOEnhancer getEnhancer() {
> return getEnhancer(getContextClassLoader());
> @@ -1849,7 +1849,7 @@
> * @param loader the loader to use for loading the JDOEnhancer
> class (if any)
> * @return the <code>JDOEnhancer</code>.
> * @throws JDOFatalUserException if no available enhancer
> - * @since 2.3
> + * @since 3.0
> */
> public static JDOEnhancer getEnhancer(ClassLoader loader) {
> ClassLoader ctrLoader = loader;
> Index: api/src/java/javax/jdo/annotations/PersistenceCapable.java
> ===================================================================
> --- api/src/java/javax/jdo/annotations/PersistenceCapable.java
> (Revision 946329)
> +++ api/src/java/javax/jdo/annotations/PersistenceCapable.java
> (Arbeitskopie)
> @@ -76,7 +76,7 @@
> String cacheable() default "true";
>
> /** Whether objects of this type should, by default, be locked
> when read.
> - * @since 2.3
> + * @since 3.0
> */
> String serializeRead() default "false";
>
> Index: api/src/java/javax/jdo/JDOEnhanceException.java
> ===================================================================
> --- api/src/java/javax/jdo/JDOEnhanceException.java (Revision 946329)
> +++ api/src/java/javax/jdo/JDOEnhanceException.java (Arbeitskopie)
> @@ -18,7 +18,7 @@
>
> /**
> * Exception thrown when an error occurs during enhancement.
> - * @since 2.3
> + * @since 3.0
> */
> public class JDOEnhanceException extends JDOException
> {
> Index: api/src/java/javax/jdo/Transaction.java
> ===================================================================
> --- api/src/java/javax/jdo/Transaction.java (Revision 946329)
> +++ api/src/java/javax/jdo/Transaction.java (Arbeitskopie)
> @@ -38,7 +38,7 @@
> * environment. When used in a managed environment, transaction
> initiation
> * and completion methods may only be used with bean-managed
> transaction
> * semantics.
> - * @version 2.3
> + * @version 3.0
> */
> public interface Transaction
> {
> @@ -235,14 +235,14 @@
> * <P>If <code>false</code> then retrieved objects will not be
> locked.
> * If null will fallback to the value for metadata for the class
> in question.
> * @param serialize the value of the serializeRead property
> - * @since 2.3
> + * @since 3.0
> */
> void setSerializeRead(Boolean serialize);
>
> /**
> * Return the current value of the serializeRead property.
> * @return the value of the serializeRead property
> - * @since 2.3
> + * @since 3.0
> */
> Boolean getSerializeRead();
> }
> Index: api/src/java/javax/jdo/metadata/DatastoreIdentityMetadata.java
> ===================================================================
> --- api/src/java/javax/jdo/metadata/DatastoreIdentityMetadata.java
> (Revision 946329)
> +++ api/src/java/javax/jdo/metadata/DatastoreIdentityMetadata.java
> (Arbeitskopie)
> @@ -20,7 +20,7 @@
>
> /**
> * Represents the datastore identity of a class.
> - * @since 2.3
> + * @since 3.0
> */
> public interface DatastoreIdentityMetadata extends Metadata {
> /**
> @@ -99,4 +99,4 @@
> * @return The number of columns
> */
> int getNumberOfColumns();
> -}
> \ No newline at end of file
> +}
> Index: api/src/java/javax/jdo/metadata/ForeignKeyMetadata.java
> ===================================================================
> --- api/src/java/javax/jdo/metadata/ForeignKeyMetadata.java
> (Revision 946329)
> +++ api/src/java/javax/jdo/metadata/ForeignKeyMetadata.java
> (Arbeitskopie)
> @@ -20,7 +20,7 @@
>
> /**
> * Represents a FK constraint in an ORM context.
> - * @since 2.3
> + * @since 3.0
> */
> public interface ForeignKeyMetadata extends Metadata {
> /**
> @@ -155,4 +155,4 @@
> * @return The PropertyMetadata
> */
> PropertyMetadata newPropertyMetadata(String name);
> -}
> \ No newline at end of file
> +}
> Index: api/src/java/javax/jdo/metadata/ClassMetadata.java
> ===================================================================
> --- api/src/java/javax/jdo/metadata/ClassMetadata.java (Revision
> 946329)
> +++ api/src/java/javax/jdo/metadata/ClassMetadata.java (Arbeitskopie)
> @@ -20,7 +20,7 @@
>
> /**
> * Represents a class.
> - * @since 2.3
> + * @since 3.0
> */
> public interface ClassMetadata extends TypeMetadata {
> /**
> @@ -48,4 +48,4 @@
> * @return The FieldMetadata
> */
> FieldMetadata newFieldMetadata(Field fld);
> -}
> \ No newline at end of file
> +}
> Index: api/src/java/javax/jdo/metadata/DiscriminatorMetadata.java
> ===================================================================
> --- api/src/java/javax/jdo/metadata/DiscriminatorMetadata.java
> (Revision 946329)
> +++ api/src/java/javax/jdo/metadata/DiscriminatorMetadata.java
> (Arbeitskopie)
> @@ -20,7 +20,7 @@
>
> /**
> * Represents the discriminator for inheritance purposes for this
> class.
> - * @since 2.3
> + * @since 3.0
> */
> public interface DiscriminatorMetadata extends Metadata {
> /**
> @@ -113,4 +113,4 @@
> * @return Index metadata
> */
> IndexMetadata getIndexMetadata();
> -}
> \ No newline at end of file
> +}
> Index: api/src/java/javax/jdo/metadata/IndexMetadata.java
> ===================================================================
> --- api/src/java/javax/jdo/metadata/IndexMetadata.java (Revision
> 946329)
> +++ api/src/java/javax/jdo/metadata/IndexMetadata.java (Arbeitskopie)
> @@ -18,7 +18,7 @@
>
> /**
> * Represents an index.
> - * @since 2.3
> + * @since 3.0
> */
> public interface IndexMetadata extends Metadata {
> /**
> @@ -113,4 +113,4 @@
> * @return The PropertyMetadata
> */
> PropertyMetadata newPropertyMetadata(String name);
> -}
> \ No newline at end of file
> +}
> Index: api/src/java/javax/jdo/metadata/SequenceMetadata.java
> ===================================================================
> --- api/src/java/javax/jdo/metadata/SequenceMetadata.java (Revision
> 946329)
> +++ api/src/java/javax/jdo/metadata/SequenceMetadata.java
> (Arbeitskopie)
> @@ -20,7 +20,7 @@
>
> /**
> * Represents a sequence.
> - * @since 2.3
> + * @since 3.0
> */
> public interface SequenceMetadata extends Metadata {
> /**
> @@ -64,4 +64,4 @@
> * @return The factory class
> */
> String getFactoryClass();
> -}
> \ No newline at end of file
> +}
> Index: api/src/java/javax/jdo/metadata/OrderMetadata.java
> ===================================================================
> --- api/src/java/javax/jdo/metadata/OrderMetadata.java (Revision
> 946329)
> +++ api/src/java/javax/jdo/metadata/OrderMetadata.java (Arbeitskopie)
> @@ -18,7 +18,7 @@
>
> /**
> * Represents ordering of a collection field/property.
> - * @since 2.3
> + * @since 3.0
> */
> public interface OrderMetadata extends Metadata {
> /**
> @@ -83,4 +83,4 @@
> * @return Index metadata
> */
> IndexMetadata getIndexMetadata();
> -}
> \ No newline at end of file
> +}
> Index: api/src/java/javax/jdo/metadata/ValueMetadata.java
> ===================================================================
> --- api/src/java/javax/jdo/metadata/ValueMetadata.java (Revision
> 946329)
> +++ api/src/java/javax/jdo/metadata/ValueMetadata.java (Arbeitskopie)
> @@ -20,7 +20,7 @@
>
> /**
> * Represents a value in a map.
> - * @since 2.3
> + * @since 3.0
> */
> public interface ValueMetadata extends Metadata {
> /**
> @@ -148,4 +148,4 @@
> * @return The ForeignKeyMetadata
> */
> ForeignKeyMetadata getForeignKeyMetadata();
> -}
> \ No newline at end of file
> +}
> Index: api/src/java/javax/jdo/metadata/TypeMetadata.java
> ===================================================================
> --- api/src/java/javax/jdo/metadata/TypeMetadata.java (Revision
> 946329)
> +++ api/src/java/javax/jdo/metadata/TypeMetadata.java (Arbeitskopie)
> @@ -22,7 +22,7 @@
>
> /**
> * Represents a class or interface. Extended for the specifics of
> those cases.
> - * @since 2.3
> + * @since 3.0
> */
> public interface TypeMetadata extends Metadata {
> /**
> @@ -407,4 +407,4 @@
> * @return The number of columns
> */
> int getNumberOfColumns();
> -}
> \ No newline at end of file
> +}
> Index: api/src/java/javax/jdo/metadata/InheritanceMetadata.java
> ===================================================================
> --- api/src/java/javax/jdo/metadata/InheritanceMetadata.java
> (Revision 946329)
> +++ api/src/java/javax/jdo/metadata/InheritanceMetadata.java
> (Arbeitskopie)
> @@ -20,7 +20,7 @@
>
> /**
> * Represents the inheritance of a class.
> - * @since 2.3
> + * @since 3.0
> */
> public interface InheritanceMetadata extends Metadata {
> /**
> @@ -78,4 +78,4 @@
> * @return Join information
> */
> JoinMetadata getJoinMetadata();
> -}
> \ No newline at end of file
> +}
> Index: api/src/java/javax/jdo/metadata/ElementMetadata.java
> ===================================================================
> --- api/src/java/javax/jdo/metadata/ElementMetadata.java (Revision
> 946329)
> +++ api/src/java/javax/jdo/metadata/ElementMetadata.java
> (Arbeitskopie)
> @@ -20,7 +20,7 @@
>
> /**
> * Represents an element in a collection/array.
> - * @since 2.3
> + * @since 3.0
> */
> public interface ElementMetadata extends Metadata {
> /**
> @@ -155,4 +155,4 @@
> * @return The ForeignKeyMetadata
> */
> ForeignKeyMetadata getForeignKeyMetadata();
> -}
> \ No newline at end of file
> +}
> Index: api/src/java/javax/jdo/metadata/CollectionMetadata.java
> ===================================================================
> --- api/src/java/javax/jdo/metadata/CollectionMetadata.java
> (Revision 946329)
> +++ api/src/java/javax/jdo/metadata/CollectionMetadata.java
> (Arbeitskopie)
> @@ -18,7 +18,7 @@
>
> /**
> * Represents details of a collection in a field/property in a class.
> - * @since 2.3
> + * @since 3.0
> */
> public interface CollectionMetadata extends Metadata {
> /**
> @@ -76,4 +76,4 @@
> * @return whether the element is dependent
> */
> Boolean getDependentElement();
> -}
> \ No newline at end of file
> +}
> Index: api/src/java/javax/jdo/metadata/PrimaryKeyMetadata.java
> ===================================================================
> --- api/src/java/javax/jdo/metadata/PrimaryKeyMetadata.java
> (Revision 946329)
> +++ api/src/java/javax/jdo/metadata/PrimaryKeyMetadata.java
> (Arbeitskopie)
> @@ -18,7 +18,7 @@
>
> /**
> * Represents the primary key definition of a class.
> - * @since 2.3
> + * @since 3.0
> */
> public interface PrimaryKeyMetadata extends Metadata {
> /**
> @@ -71,4 +71,4 @@
> * @return The number of columns
> */
> int getNumberOfColumns();
> -}
> \ No newline at end of file
> +}
> Index: api/src/java/javax/jdo/metadata/ColumnMetadata.java
> ===================================================================
> --- api/src/java/javax/jdo/metadata/ColumnMetadata.java (Revision
> 946329)
> +++ api/src/java/javax/jdo/metadata/ColumnMetadata.java (Arbeitskopie)
> @@ -18,7 +18,7 @@
>
> /**
> * Represents an element in a collection/array.
> - * @since 2.3
> + * @since 3.0
> */
> public interface ColumnMetadata extends Metadata {
> /**
> @@ -160,4 +160,4 @@
> * @return Insert value
> */
> String getInsertValue();
> -}
> \ No newline at end of file
> +}
> Index: api/src/java/javax/jdo/metadata/JoinMetadata.java
> ===================================================================
> --- api/src/java/javax/jdo/metadata/JoinMetadata.java (Revision
> 946329)
> +++ api/src/java/javax/jdo/metadata/JoinMetadata.java (Arbeitskopie)
> @@ -20,7 +20,7 @@
>
> /**
> * Represents join information.
> - * @since 2.3
> + * @since 3.0
> */
> public interface JoinMetadata extends Metadata {
> /**
> @@ -183,4 +183,4 @@
> * @return The number of columns
> */
> int getNumberOfColumns();
> -}
> \ No newline at end of file
> +}
> Index: api/src/java/javax/jdo/metadata/InterfaceMetadata.java
> ===================================================================
> --- api/src/java/javax/jdo/metadata/InterfaceMetadata.java (Revision
> 946329)
> +++ api/src/java/javax/jdo/metadata/InterfaceMetadata.java
> (Arbeitskopie)
> @@ -18,8 +18,8 @@
>
> /**
> * Represents a persistent-interface.
> - * @since 2.3
> + * @since 3.0
> */
> public interface InterfaceMetadata extends TypeMetadata {
>
> -}
> \ No newline at end of file
> +}
> Index: api/src/java/javax/jdo/metadata/FetchPlanMetadata.java
> ===================================================================
> --- api/src/java/javax/jdo/metadata/FetchPlanMetadata.java (Revision
> 946329)
> +++ api/src/java/javax/jdo/metadata/FetchPlanMetadata.java
> (Arbeitskopie)
> @@ -18,7 +18,7 @@
>
> /**
> * Represents a fetch plan for a class.
> - * @since 2.3
> + * @since 3.0
> */
> public interface FetchPlanMetadata extends Metadata {
> /**
> @@ -77,4 +77,4 @@
> * @return The number of fetch groups
> */
> int getNumberOfFetchGroups();
> -}
> \ No newline at end of file
> +}
> Index: api/src/java/javax/jdo/metadata/QueryMetadata.java
> ===================================================================
> --- api/src/java/javax/jdo/metadata/QueryMetadata.java (Revision
> 946329)
> +++ api/src/java/javax/jdo/metadata/QueryMetadata.java (Arbeitskopie)
> @@ -18,7 +18,7 @@
>
> /**
> * Represents a named query.
> - * @since 2.3
> + * @since 3.0
> */
> public interface QueryMetadata extends Metadata {
> /**
> @@ -109,4 +109,4 @@
> * @return The fetch plan name
> */
> String getFetchPlan();
> -}
> \ No newline at end of file
> +}
> Index: api/src/java/javax/jdo/metadata/FetchGroupMetadata.java
> ===================================================================
> --- api/src/java/javax/jdo/metadata/FetchGroupMetadata.java
> (Revision 946329)
> +++ api/src/java/javax/jdo/metadata/FetchGroupMetadata.java
> (Arbeitskopie)
> @@ -18,7 +18,7 @@
>
> /**
> * Represents a fetch group for a class.
> - * @since 2.3
> + * @since 3.0
> */
> public interface FetchGroupMetadata extends Metadata {
> /**
> @@ -70,4 +70,4 @@
> * @return The PropertyMetadata
> */
> PropertyMetadata newPropertyMetadata(String name);
> -}
> \ No newline at end of file
> +}
> Index: api/src/java/javax/jdo/metadata/UniqueMetadata.java
> ===================================================================
> --- api/src/java/javax/jdo/metadata/UniqueMetadata.java (Revision
> 946329)
> +++ api/src/java/javax/jdo/metadata/UniqueMetadata.java (Arbeitskopie)
> @@ -18,7 +18,7 @@
>
> /**
> * Represents a unique constraint.
> - * @since 2.3
> + * @since 3.0
> */
> public interface UniqueMetadata extends Metadata {
> /**
> @@ -111,4 +111,4 @@
> * @return The PropertyMetadata
> */
> PropertyMetadata newPropertyMetadata(String name);
> -}
> \ No newline at end of file
> +}
> Index: api/src/java/javax/jdo/metadata/MemberMetadata.java
> ===================================================================
> --- api/src/java/javax/jdo/metadata/MemberMetadata.java (Revision
> 946329)
> +++ api/src/java/javax/jdo/metadata/MemberMetadata.java (Arbeitskopie)
> @@ -23,7 +23,7 @@
>
> /**
> * Represents a field/property in a class/persistent-interface.
> - * @since 2.3
> + * @since 3.0
> */
> public interface MemberMetadata extends Metadata {
> /**
> @@ -510,4 +510,4 @@
> * @return The number of columns
> */
> int getNumberOfColumns();
> -}
> \ No newline at end of file
> +}
> Index: api/src/java/javax/jdo/metadata/ExtensionMetadata.java
> ===================================================================
> --- api/src/java/javax/jdo/metadata/ExtensionMetadata.java (Revision
> 946329)
> +++ api/src/java/javax/jdo/metadata/ExtensionMetadata.java
> (Arbeitskopie)
> @@ -19,7 +19,7 @@
> /**
> * A vendor extension defined in Metadata.
> *
> - * @version 2.3
> + * @version 3.0
> */
> public interface ExtensionMetadata {
> /**
> @@ -39,4 +39,4 @@
> * @return The value
> */
> String getValue();
> -}
> \ No newline at end of file
> +}
> Index: api/src/java/javax/jdo/metadata/JDOMetadata.java
> ===================================================================
> --- api/src/java/javax/jdo/metadata/JDOMetadata.java (Revision 946329)
> +++ api/src/java/javax/jdo/metadata/JDOMetadata.java (Arbeitskopie)
> @@ -18,7 +18,7 @@
>
> /**
> * Represents the top-level JDO metadata.
> - * @since 2.3
> + * @since 3.0
> */
> public interface JDOMetadata extends Metadata {
> /**
> @@ -144,4 +144,4 @@
> * @return The number of fetch plans.
> */
> int getNumberOfFetchPlans();
> -}
> \ No newline at end of file
> +}
> Index: api/src/java/javax/jdo/metadata/MapMetadata.java
> ===================================================================
> --- api/src/java/javax/jdo/metadata/MapMetadata.java (Revision 946329)
> +++ api/src/java/javax/jdo/metadata/MapMetadata.java (Arbeitskopie)
> @@ -18,7 +18,7 @@
>
> /**
> * Represents details of a map in a field/property in a class.
> - * @since 2.3
> + * @since 3.0
> */
> public interface MapMetadata extends Metadata {
> /**
> @@ -132,4 +132,4 @@
> * @return whether the value is dependent
> */
> Boolean getDependentValue();
> -}
> \ No newline at end of file
> +}
> Index: api/src/java/javax/jdo/metadata/ArrayMetadata.java
> ===================================================================
> --- api/src/java/javax/jdo/metadata/ArrayMetadata.java (Revision
> 946329)
> +++ api/src/java/javax/jdo/metadata/ArrayMetadata.java (Arbeitskopie)
> @@ -18,7 +18,7 @@
>
> /**
> * Represents details of an array in a field/property in a class.
> - * @since 2.3
> + * @since 3.0
> */
> public interface ArrayMetadata extends Metadata {
> /**
> @@ -76,4 +76,4 @@
> * @return whether the element is dependent
> */
> Boolean getDependentElement();
> -}
> \ No newline at end of file
> +}
> Index: api/src/java/javax/jdo/metadata/Indexed.java
> ===================================================================
> --- api/src/java/javax/jdo/metadata/Indexed.java (Revision 946329)
> +++ api/src/java/javax/jdo/metadata/Indexed.java (Arbeitskopie)
> @@ -19,8 +19,8 @@
> /**
> * Enumeration of the indexed values.
> *
> - * @version 2.3
> - * @since 2.3
> + * @version 3.0
> + * @since 3.0
> */
> public enum Indexed
> {
> Index: api/src/java/javax/jdo/metadata/Metadata.java
> ===================================================================
> --- api/src/java/javax/jdo/metadata/Metadata.java (Revision 946329)
> +++ api/src/java/javax/jdo/metadata/Metadata.java (Arbeitskopie)
> @@ -19,7 +19,7 @@
> /**
> * This interface provides base level definitions for all metadata
> components.
> *
> - * @version 2.3
> + * @version 3.0
> */
> public interface Metadata {
> /**
> @@ -52,4 +52,4 @@
> * @return The parent
> */
> Metadata getParent();
> -}
> \ No newline at end of file
> +}
> Index: api/src/java/javax/jdo/metadata/FieldMetadata.java
> ===================================================================
> --- api/src/java/javax/jdo/metadata/FieldMetadata.java (Revision
> 946329)
> +++ api/src/java/javax/jdo/metadata/FieldMetadata.java (Arbeitskopie)
> @@ -18,8 +18,8 @@
>
> /**
> * Represents a field in a class.
> - * @since 2.3
> + * @since 3.0
> */
> public interface FieldMetadata extends MemberMetadata {
>
> -}
> \ No newline at end of file
> +}
> Index: api/src/java/javax/jdo/metadata/PropertyMetadata.java
> ===================================================================
> --- api/src/java/javax/jdo/metadata/PropertyMetadata.java (Revision
> 946329)
> +++ api/src/java/javax/jdo/metadata/PropertyMetadata.java
> (Arbeitskopie)
> @@ -18,7 +18,7 @@
>
> /**
> * Represents a property in a class/persistent-interface.
> - * @since 2.3
> + * @since 3.0
> */
> public interface PropertyMetadata extends MemberMetadata {
> /**
> @@ -34,4 +34,4 @@
> * @return Field name
> */
> String getFieldName();
> -}
> \ No newline at end of file
> +}
> Index: api/src/java/javax/jdo/metadata/VersionMetadata.java
> ===================================================================
> --- api/src/java/javax/jdo/metadata/VersionMetadata.java (Revision
> 946329)
> +++ api/src/java/javax/jdo/metadata/VersionMetadata.java
> (Arbeitskopie)
> @@ -20,7 +20,7 @@
>
> /**
> * Represents versioning of a class.
> - * @since 2.3
> + * @since 3.0
> */
> public interface VersionMetadata extends Metadata {
> /**
> @@ -99,4 +99,4 @@
> * @return Index metadata
> */
> IndexMetadata getIndexMetadata();
> -}
> \ No newline at end of file
> +}
> Index: api/src/java/javax/jdo/metadata/ClassPersistenceModifier.java
> ===================================================================
> --- api/src/java/javax/jdo/metadata/ClassPersistenceModifier.java
> (Revision 946329)
> +++ api/src/java/javax/jdo/metadata/ClassPersistenceModifier.java
> (Arbeitskopie)
> @@ -18,7 +18,7 @@
>
> /**
> * Enumeration of the persistence-modifier values for a class.
> - * @since 2.3
> + * @since 3.0
> */
> public enum ClassPersistenceModifier
> {
> Index: api/src/java/javax/jdo/metadata/EmbeddedMetadata.java
> ===================================================================
> --- api/src/java/javax/jdo/metadata/EmbeddedMetadata.java (Revision
> 946329)
> +++ api/src/java/javax/jdo/metadata/EmbeddedMetadata.java
> (Arbeitskopie)
> @@ -18,7 +18,7 @@
>
> /**
> * Represents embedding details of a field/property in a class.
> - * @since 2.3
> + * @since 3.0
> */
> public interface EmbeddedMetadata extends Metadata {
> /**
> @@ -92,4 +92,4 @@
> * @return The PropertyMetadata
> */
> PropertyMetadata newPropertyMetadata(String name);
> -}
> \ No newline at end of file
> +}
> Index: api/src/java/javax/jdo/metadata/PackageMetadata.java
> ===================================================================
> --- api/src/java/javax/jdo/metadata/PackageMetadata.java (Revision
> 946329)
> +++ api/src/java/javax/jdo/metadata/PackageMetadata.java
> (Arbeitskopie)
> @@ -20,7 +20,7 @@
>
> /**
> * Represents a package within a JDOMetadata.
> - * @since 2.3
> + * @since 3.0
> */
> public interface PackageMetadata extends Metadata {
> /**
> @@ -141,4 +141,4 @@
> * @return The number of sequences.
> */
> int getNumberOfSequences();
> -}
> \ No newline at end of file
> +}
> Index: api/src/java/javax/jdo/PersistenceManagerFactory.java
> ===================================================================
> --- api/src/java/javax/jdo/PersistenceManagerFactory.java (Revision
> 946329)
> +++ api/src/java/javax/jdo/PersistenceManagerFactory.java
> (Arbeitskopie)
> @@ -529,7 +529,7 @@
> * javax.jdo.option.DatastoreTimeout is returned by
> supportedOptions().
> * If timeouts are not supported,this method will throw
> * JDOUnsupportedOptionException.
> - * @since 2.3
> + * @since 3.0
> * @param interval the timeout interval (milliseconds)
> */
> void setDatastoreReadTimeoutMillis(Integer interval);
> @@ -538,7 +538,7 @@
> * If timeouts are not supported,this method will return null.
> * @see #setDatastoreReadTimeoutMillis(Integer)
> * @return the default timeout setting (milliseconds).
> - * @since 2.3
> + * @since 3.0
> */
> Integer getDatastoreReadTimeoutMillis();
>
> @@ -551,7 +551,7 @@
> * javax.jdo.option.DatastoreTimeout is returned by
> supportedOptions().
> * If timeouts are not supported,this method will throw
> * JDOUnsupportedOptionException.
> - * @since 2.3
> + * @since 3.0
> * @param interval the timeout interval (milliseconds)
> */
> void setDatastoreWriteTimeoutMillis(Integer interval);
> @@ -560,7 +560,7 @@
> * If timeouts are not supported,this method will return null.
> * @see #setDatastoreWriteTimeoutMillis(Integer)
> * @return the default timeout setting (milliseconds).
> - * @since 2.3
> + * @since 3.0
> */
> Integer getDatastoreWriteTimeoutMillis();
>
> @@ -756,7 +756,7 @@
> * If there is already metadata registered for a class contained
> in this metadata
> * object then a JDOUserException will be thrown.
> * @param metadata The Metadata to register.
> - * @since 2.3
> + * @since 3.0
> */
> void registerMetadata(JDOMetadata metadata);
>
> @@ -764,7 +764,7 @@
> * Method to return a new metadata object that can be
> subsequently modified
> * and registered with the persistence process using the method
> {@link #registerMetadata}.
> * @return The metadata
> - * @since 2.3
> + * @since 3.0
> */
> JDOMetadata newMetadata();
>
> @@ -774,7 +774,7 @@
> * If there is no metadata for the specified class/interface, or
> the parameter is null,
> * then null will be returned.
> * @return The metadata
> - * @since 2.3
> + * @since 3.0
> */
> TypeMetadata getMetadata(String className);
> }
> Index: api/src/java/javax/jdo/PersistenceManager.java
> ===================================================================
> --- api/src/java/javax/jdo/PersistenceManager.java (Revision 946329)
> +++ api/src/java/javax/jdo/PersistenceManager.java (Arbeitskopie)
> @@ -971,7 +971,7 @@
> * PersistenceManagerFactory.supportedOptions().
> * If timeouts are not supported,this method will throw
> * JDOUnsupportedOptionException.
> - * @since 2.3
> + * @since 3.0
> * @param interval the timeout interval (milliseconds)
> */
> void setDatastoreReadTimeoutMillis(Integer interval);
> @@ -984,7 +984,7 @@
> * @see #setDatastoreReadTimeoutMillis(Integer)
> * @see
> PersistenceManagerFactory#setDatastoreReadTimeoutMillis(Integer)
> * @return the effective timeout setting (milliseconds).
> - * @since 2.3
> + * @since 3.0
> */
> Integer getDatastoreReadTimeoutMillis();
>
> @@ -1006,7 +1006,7 @@
> * PersistenceManagerFactory.supportedOptions().
> * If timeouts are not supported,this method will throw
> * JDOUnsupportedOptionException.
> - * @since 2.3
> + * @since 3.0
> * @param interval the timeout interval (milliseconds)
> */
> void setDatastoreWriteTimeoutMillis(Integer interval);
> @@ -1018,7 +1018,7 @@
> * @see #setDatastoreWriteTimeoutMillis(Integer)
> * @see
> PersistenceManagerFactory#setDatastoreWriteTimeoutMillis(Integer)
> * @return the effective timeout setting (milliseconds).
> - * @since 2.3
> + * @since 3.0
> */
> Integer getDatastoreWriteTimeoutMillis();
>
> Index: api/src/java/javax/jdo/JDOEnhancer.java
> ===================================================================
> --- api/src/java/javax/jdo/JDOEnhancer.java (Revision 946329)
> +++ api/src/java/javax/jdo/JDOEnhancer.java (Arbeitskopie)
> @@ -23,7 +23,7 @@
>
> /**
> * Interface for a JDO Enhancer.
> - * @since 2.3
> + * @since 3.0
> */
> public interface JDOEnhancer extends ClassFileTransformer
> {
> @@ -138,7 +138,7 @@
> * If there is already metadata registered for a class contained
> in this metadata
> * object then a JDOUserException will be thrown.
> * @param metadata The Metadata to register.
> - * @since 2.3
> + * @since 3.0
> */
> void registerMetadata(JDOMetadata metadata);
>
> @@ -146,7 +146,7 @@
> * Method to return a new metadata object that can be
> subsequently modified
> * and registered with the enhancement process using the method
> {@link #registerMetadata}.
> * @return The metadata
> - * @since 2.3
> + * @since 3.0
> */
> JDOMetadata newMetadata();
> -}
> \ No newline at end of file
> +}
> Index: api/src/java/javax/jdo/Enhancer.java
> ===================================================================
> --- api/src/java/javax/jdo/Enhancer.java (Revision 946329)
> +++ api/src/java/javax/jdo/Enhancer.java (Arbeitskopie)
> @@ -65,7 +65,7 @@
> * </li><li>Directories will be searched recursively if the -r
> option is set
> * </li></ul>
> *
> - * @since 2.3
> + * @since 3.0
> */
> public class Enhancer {
>
> @@ -453,4 +453,4 @@
> addVerboseMessage(msgId, String.valueOf(where));
> }
>
> -}
> \ No newline at end of file
> +}
Craig L Russell
Architect, Oracle
http://db.apache.org/jdo
408 276-5638 mailto:Craig.Russell@oracle.com
P.S. A good JDO? O, Gasp!
Re: New jdo projects in svn repo
Posted by Michael Bouschen <mb...@spree.de>.
Hi Craig,
I see the same results as Andy.
I propose a minor change in the api project: replace @since 2.3 by
@since 3.0 in the javadoc. Attached you find a patch implementing the
change. I can check it in, please let me know.
Regards Michael
> Hi Andy,
>
> I think I understand all of this and will fix shortly.
>
> Thanks,
>
> Craig
>
> On May 19, 2010, at 8:51 AM, Andy Jefferson wrote:
>
>
>> Hi Craig,
>>
>>
>>> I think these are pretty close to what we want to ship for the next
>>> release. Can others please try the two projects and see if there are
>>> any issues?
>>>
>> api builds ok for me, but creates 2.3-SNAPSHOT (from parent
>> project.xml) not
>> 3.0-SNAPSHOT
>>
>> api/pom.xml has artifactId="jdo2-api" and name="JDO2 API".
>> Should be "jdo-api" and "JDO API"
>>
>> api/project.xml has name="JDO2 API"
>> Should be "JDO API"
>>
>>
>>
>> tck
>> enhancement.conf gave
>> [java] Cannot find test class
>> 'org.apache.jdo.tck.enhancement.FieldAccessModified'.
>> [java] Cannot find test class
>> 'org.apache.jdo.tck.enhancement.ImplementsPersistenceCapable'.
>> Maybe these are tests that shouldn't be run or something ?
>>
>>
>>
>>
>>
>> --
>> Andy
>> DataNucleus (http://www.datanucleus.org)
>>
>
> Craig L Russell
> Architect, Oracle
> http://db.apache.org/jdo
> 408 276-5638 mailto:Craig.Russell@oracle.com
> P.S. A good JDO? O, Gasp!
>
>
--
*Michael Bouschen*
*Prokurist*
akquinet tech@spree GmbH
Bülowstr. 66, D-10783 Berlin
Fon: +49 30 235 520-33
Fax: +49 30 217 520-12
Email: michael.bouschen@akquinet.de
Url: www.akquinet.de <http://www.akquinet.de>
akquinet tech@spree GmbH, Berlin
Geschäftsführung: Martin Weber, Prof. Dr. Christian Roth
Amtsgericht Berlin-Charlottenburg HRB 86780 B
USt.-Id. Nr.: DE 225 964 680
Re: New jdo projects in svn repo
Posted by Michael Bouschen <mb...@spree.de>.
Hi,
[...]
>> tck
>> enhancement.conf gave
>> [java] Cannot find test class
>> 'org.apache.jdo.tck.enhancement.FieldAccessModified'.
>> [java] Cannot find test class
>> 'org.apache.jdo.tck.enhancement.ImplementsPersistenceCapable'.
>> Maybe these are tests that shouldn't be run or something ?
>>
>>
I think we just need to remove the two tests FieldAccessModified and
ImplementsPersistenceCapable from enhancement.conf. The two TCK test
classes were excluded from the TCK run before and are now deleted.
Regards Michael
--
*Michael Bouschen*
*Prokurist*
akquinet tech@spree GmbH
Bülowstr. 66, D-10783 Berlin
Fon: +49 30 235 520-33
Fax: +49 30 217 520-12
Email: michael.bouschen@akquinet.de
Url: www.akquinet.de <http://www.akquinet.de>
akquinet tech@spree GmbH, Berlin
Geschäftsführung: Martin Weber, Prof. Dr. Christian Roth
Amtsgericht Berlin-Charlottenburg HRB 86780 B
USt.-Id. Nr.: DE 225 964 680
Re: New jdo projects in svn repo
Posted by Craig L Russell <cr...@oracle.com>.
Hi Andy,
I think I understand all of this and will fix shortly.
Thanks,
Craig
On May 19, 2010, at 8:51 AM, Andy Jefferson wrote:
> Hi Craig,
>
>> I think these are pretty close to what we want to ship for the next
>> release. Can others please try the two projects and see if there are
>> any issues?
>
> api builds ok for me, but creates 2.3-SNAPSHOT (from parent
> project.xml) not
> 3.0-SNAPSHOT
>
> api/pom.xml has artifactId="jdo2-api" and name="JDO2 API".
> Should be "jdo-api" and "JDO API"
>
> api/project.xml has name="JDO2 API"
> Should be "JDO API"
>
>
>
> tck
> enhancement.conf gave
> [java] Cannot find test class
> 'org.apache.jdo.tck.enhancement.FieldAccessModified'.
> [java] Cannot find test class
> 'org.apache.jdo.tck.enhancement.ImplementsPersistenceCapable'.
> Maybe these are tests that shouldn't be run or something ?
>
>
>
>
>
> --
> Andy
> DataNucleus (http://www.datanucleus.org)
Craig L Russell
Architect, Oracle
http://db.apache.org/jdo
408 276-5638 mailto:Craig.Russell@oracle.com
P.S. A good JDO? O, Gasp!
Re: New jdo projects in svn repo
Posted by Andy Jefferson <an...@datanucleus.org>.
Hi Craig,
> I think these are pretty close to what we want to ship for the next
> release. Can others please try the two projects and see if there are
> any issues?
api builds ok for me, but creates 2.3-SNAPSHOT (from parent project.xml) not
3.0-SNAPSHOT
api/pom.xml has artifactId="jdo2-api" and name="JDO2 API".
Should be "jdo-api" and "JDO API"
api/project.xml has name="JDO2 API"
Should be "JDO API"
tck
enhancement.conf gave
[java] Cannot find test class
'org.apache.jdo.tck.enhancement.FieldAccessModified'.
[java] Cannot find test class
'org.apache.jdo.tck.enhancement.ImplementsPersistenceCapable'.
Maybe these are tests that shouldn't be run or something ?
--
Andy
DataNucleus (http://www.datanucleus.org)