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...@Sun.COM> on 2007/10/19 19:22:58 UTC
Fwd: svn commit: r586545 - in /db/jdo/trunk:
api2-legacy/src/java/javax/jdo/ api2/src/java/javax/jdo/
api2/src/java/javax/jdo/annotations/ api2/src/java/javax/jdo/datastore/
tck2-legacy/src/conf/ tck2-legacy/src/java/org/apache/jdo/tck/util/signature/
tck2/...
Please note that this change, once applied, will not work with JPOX
until... umm, when is JPOX going to be updated?
Craig
Begin forwarded message:
> From: clr@apache.org
> Date: October 19, 2007 10:14:59 AM PDT
> To: jdo-commits@db.apache.org
> Subject: svn commit: r586545 - in /db/jdo/trunk: api2-legacy/src/
> java/javax/jdo/ api2/src/java/javax/jdo/ api2/src/java/javax/jdo/
> annotations/ api2/src/java/javax/jdo/datastore/ tck2-legacy/src/
> conf/ tck2-legacy/src/java/org/apache/jdo/tck/util/signature/ tck2/...
> Reply-To: jdo-dev@db.apache.org
>
> Author: clr
> Date: Fri Oct 19 10:14:50 2007
> New Revision: 586545
>
> URL: http://svn.apache.org/viewvc?rev=586545&view=rev
> Log:
> JDO-538 Change signatures to be more Java 5 friendly
>
> Removed:
> db/jdo/trunk/api2/src/java/javax/jdo/annotations/Implements.java
> Modified:
> db/jdo/trunk/api2-legacy/src/java/javax/jdo/
> PersistenceManager.java
> db/jdo/trunk/api2/src/java/javax/jdo/FetchPlan.java
> db/jdo/trunk/api2/src/java/javax/jdo/PersistenceManager.java
> db/jdo/trunk/api2/src/java/javax/jdo/
> PersistenceManagerFactory.java
> db/jdo/trunk/api2/src/java/javax/jdo/Query.java
> db/jdo/trunk/api2/src/java/javax/jdo/datastore/DataStoreCache.java
> db/jdo/trunk/tck2-legacy/src/conf/jdo-2_1-signatures.txt
> db/jdo/trunk/tck2-legacy/src/java/org/apache/jdo/tck/util/
> signature/SignatureVerifier.java
> db/jdo/trunk/tck2/src/conf/jdo-2_1-signatures.txt
> db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/util/signature/
> SignatureVerifier.java
>
> Modified: db/jdo/trunk/api2-legacy/src/java/javax/jdo/
> PersistenceManager.java
> URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2-legacy/src/java/
> javax/jdo/PersistenceManager.java?
> rev=586545&r1=586544&r2=586545&view=diff
> ======================================================================
> ========
> --- db/jdo/trunk/api2-legacy/src/java/javax/jdo/
> PersistenceManager.java (original)
> +++ db/jdo/trunk/api2-legacy/src/java/javax/jdo/
> PersistenceManager.java Fri Oct 19 10:14:50 2007
> @@ -452,11 +452,25 @@
> * @return the objects that were looked up, in the
> * same order as the oids parameter.
> * @see #getObjectById(Object,boolean)
> + * @see #getObjectsById(boolean,Object[])
> + * @deprecated
> * @since 2.0
> */
> Object[] getObjectsById (Object[] oids, boolean validate);
>
> /**
> + * Return the objects with the given oids.
> + * @param oids the oids of the objects to return
> + * @param validate if true, the existance of the objects in
> + * the datastore will be validated.
> + * @return the objects that were looked up, in the
> + * same order as the oids parameter.
> + * @see #getObjectById(Object,boolean)
> + * @since 2.1
> + */
> + Object[] getObjectsById (boolean validate, Object[] oids);
> +
> + /**
> * Return the objects with the given oids. This method is
> equivalent
> * to calling {@link #getObjectsById(Object[],boolean)}
> * with the validate flag true.
> @@ -640,12 +654,35 @@
> * @param pcs the root instances to make transient.
> * @param useFetchPlan whether to use the current fetch plan
> to determine
> * which fields to load and which instances to make transient
> + * @see #makeTransientAll(boolean,Object[])
> + * @deprecated
> * @since 2.0
> */
> void makeTransientAll (Object[] pcs, boolean useFetchPlan);
>
> /** Make instances transient, removing them from management
> * by this <code>PersistenceManager</code>. If the
> useFetchPlan parameter
> + * is false, this method behaves exactly as makeTransientAll
> (Object[] pcs).
> + * <P>The affected instance(s) lose their JDO identity and are
> no longer
> + * associated with any <code>PersistenceManager</code>. The
> state
> + * of fields is unchanged.
> + * <P>If the useFetchPlan parameter is true, then the current
> FetchPlan
> + * is applied to the pcs parameters and the entire graph of
> instances
> + * reachable via loaded fields is made transient. The state of
> fields
> + * in the affected instances is as specified by the FetchPlan.
> + * <P>Unlike detachCopy, the instances are not detached; there
> is no
> + * detachment information in the instances.
> + * <P>The instances to be made transient do not need to
> + * implement the javax.jdo.spi.Detachable interface.
> + * @param pcs the root instances to make transient.
> + * @param useFetchPlan whether to use the current fetch plan
> to determine
> + * which fields to load and which instances to make transient
> + * @since 2.1
> + */
> + void makeTransientAll (boolean useFetchPlan, Object[] pcs);
> +
> + /** Make instances transient, removing them from management
> + * by this <code>PersistenceManager</code>. If the
> useFetchPlan parameter
> * is false, this method behaves exactly as
> * makeTransientAll(Collection pcs).
> * <P>The affected instance(s) lose their JDO identity and are
> no longer
> @@ -808,9 +845,32 @@
> * @param pcs the instances
> * @param useFetchPlan whether to use the current fetch plan
> to determine
> * which fields to load and which instances to retrieve.
> + * @deprecated
> + * @see #retrieveAll(boolean,Object[])
> * @since 1.0.1
> */
> void retrieveAll (Object[] pcs, boolean useFetchPlan);
> +
> + /** Retrieve field values of instances from the store. This
> tells
> + * the <code>PersistenceManager</code> that the application
> intends to use
> + * the instances, and their field values should be retrieved.
> The fields
> + * in the current fetch group must be retrieved, and the
> implementation
> + * might retrieve more fields than the current fetch group.
> + * <P>If the useFetchPlan parameter is false, this method
> behaves exactly
> + * as the corresponding method without the useFetchPlan
> parameter.
> + * If the useFetchPlan parameter is true, and the fetch plan
> has not been
> + * modified from its default setting, all fields in the
> current fetch plan
> + * are fetched, and other fields might be fetched lazily by the
> + * implementation. If the useFetchPlan parameter is true, and
> the fetch
> + * plan has been changed from its default setting, then the
> fields
> + * specified by the fetch plan are loaded, along with related
> instances
> + * specified by the fetch plan.
> + * @param pcs the instances
> + * @param useFetchPlan whether to use the current fetch plan
> to determine
> + * which fields to load and which instances to retrieve.
> + * @since 2.1
> + */
> + void retrieveAll (boolean useFetchPlan, Object[] pcs);
>
> /** The application can manage the <code>PersistenceManager</
> code> instances
> * more easily by having an application object associated with
> each
>
> Modified: db/jdo/trunk/api2/src/java/javax/jdo/FetchPlan.java
> URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/
> jdo/FetchPlan.java?rev=586545&r1=586544&r2=586545&view=diff
> ======================================================================
> ========
> --- db/jdo/trunk/api2/src/java/javax/jdo/FetchPlan.java (original)
> +++ db/jdo/trunk/api2/src/java/javax/jdo/FetchPlan.java Fri Oct 19
> 10:14:50 2007
> @@ -132,7 +132,7 @@
> * @return the FetchPlan
> * @since 2.0
> */
> - FetchPlan setGroups(String[]fetchGroupNames);
> + FetchPlan setGroups(String... fetchGroupNames);
>
> /**
> * Set the active fetch groups to the single named fetch group.
> @@ -180,7 +180,7 @@
> * @param rootClasses The root classes.
> * @since 2.0
> */
> - FetchPlan setDetachmentRootClasses(Class[] rootClasses);
> + FetchPlan setDetachmentRootClasses(Class... rootClasses);
>
> /**
> * Get the root classes for DetachAllOnCommit.
>
> Modified: db/jdo/trunk/api2/src/java/javax/jdo/PersistenceManager.java
> URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/
> jdo/PersistenceManager.java?rev=586545&r1=586544&r2=586545&view=diff
> ======================================================================
> ========
> --- db/jdo/trunk/api2/src/java/javax/jdo/PersistenceManager.java
> (original)
> +++ db/jdo/trunk/api2/src/java/javax/jdo/PersistenceManager.java
> Fri Oct 19 10:14:50 2007
> @@ -89,7 +89,7 @@
> * @see #evict(Object pc)
> * @param pcs the array of instances to evict from the cache.
> */
> - void evictAll (Object[] pcs);
> + void evictAll (Object... pcs);
>
> /** Mark a <code>Collection</code> of instances as no longer
> needed in the
> * cache.
> @@ -131,7 +131,7 @@
> * @see #refresh(Object pc)
> * @param pcs the array of instances to refresh.
> */
> - void refreshAll (Object[] pcs);
> + void refreshAll (Object... pcs);
>
> /** Refresh the state of a <code>Collection</code> of
> instances from the
> * data store.
> @@ -452,21 +452,35 @@
> * @return the objects that were looked up, in the
> * same order as the oids parameter.
> * @see #getObjectById(Object,boolean)
> + * @see #getObjectsById(boolean,Object...)
> + * @deprecated
> * @since 2.0
> */
> Object[] getObjectsById (Object[] oids, boolean validate);
>
> /**
> + * Return the objects with the given oids.
> + * @param oids the oids of the objects to return
> + * @param validate if true, the existance of the objects in
> + * the datastore will be validated.
> + * @return the objects that were looked up, in the
> + * same order as the oids parameter.
> + * @see #getObjectById(Object,boolean)
> + * @since 2.1
> + */
> + Object[] getObjectsById (boolean validate, Object... oids);
> +
> + /**
> * Return the objects with the given oids. This method is
> equivalent
> - * to calling {@link #getObjectsById(Object[],boolean)}
> + * to calling {@link #getObjectsById(boolean,Object...)}
> * with the validate flag true.
> * @param oids the oids of the objects to return
> * @return the objects that were looked up, in the
> * same order as the oids parameter.
> - * @see #getObjectsById(Object[],boolean)
> + * @see #getObjectsById(boolean,Object...)
> * @since 2.0
> */
> - Object[] getObjectsById (Object[] oids);
> + Object[] getObjectsById (Object... oids);
>
> /** Make the parameter instance persistent in this
> * <code>PersistenceManager</code>.
> @@ -525,7 +539,7 @@
> */
> <T> T makePersistent (T pc);
>
> - /** Make an array of instances persistent.
> + /** Make an array of instances persistent.
> * @param pcs an array of instances
> * @return the parameter instances for parameters in the
> transient or
> * persistent state, or the corresponding persistent instance
> @@ -533,7 +547,7 @@
> * parameter array
> * @see #makePersistent(Object pc)
> */
> - <T> T[] makePersistentAll (T[] pcs);
> + <T> T[] makePersistentAll (T... pcs);
>
> /** Make a <code>Collection</code> of instances persistent.
> * @param pcs a <code>Collection</code> of instances
> @@ -563,7 +577,7 @@
> * @param pcs a <code>Collection</code> of persistent instances
> * @see #deletePersistent(Object pc)
> */
> - void deletePersistentAll (Object[] pcs);
> + void deletePersistentAll (Object... pcs);
>
> /** Delete a <code>Collection</code> of instances from the
> data store.
> * @param pcs a <code>Collection</code> of persistent instances
> @@ -589,7 +603,7 @@
> * is preserved unchanged.
> * @param pcs the instances to make transient.
> */
> - void makeTransientAll (Object[] pcs);
> + void makeTransientAll (Object... pcs);
>
> /** Make a <code>Collection</code> of instances transient,
> removing them
> * from management by this <code>PersistenceManager</code>.
> @@ -640,12 +654,35 @@
> * @param pcs the root instances to make transient.
> * @param useFetchPlan whether to use the current fetch plan
> to determine
> * which fields to load and which instances to make transient
> + * @see #makeTransientAll(boolean,Object...)
> + * @deprecated
> * @since 2.0
> */
> void makeTransientAll (Object[] pcs, boolean useFetchPlan);
>
> /** Make instances transient, removing them from management
> * by this <code>PersistenceManager</code>. If the
> useFetchPlan parameter
> + * is false, this method behaves exactly as makeTransientAll
> (Object[] pcs).
> + * <P>The affected instance(s) lose their JDO identity and are
> no longer
> + * associated with any <code>PersistenceManager</code>. The
> state
> + * of fields is unchanged.
> + * <P>If the useFetchPlan parameter is true, then the current
> FetchPlan
> + * is applied to the pcs parameters and the entire graph of
> instances
> + * reachable via loaded fields is made transient. The state of
> fields
> + * in the affected instances is as specified by the FetchPlan.
> + * <P>Unlike detachCopy, the instances are not detached; there
> is no
> + * detachment information in the instances.
> + * <P>The instances to be made transient do not need to
> + * implement the javax.jdo.spi.Detachable interface.
> + * @param pcs the root instances to make transient.
> + * @param useFetchPlan whether to use the current fetch plan
> to determine
> + * which fields to load and which instances to make transient
> + * @since 2.1
> + */
> + void makeTransientAll (boolean useFetchPlan, Object... pcs);
> +
> + /** Make instances transient, removing them from management
> + * by this <code>PersistenceManager</code>. If the
> useFetchPlan parameter
> * is false, this method behaves exactly as
> * makeTransientAll(Collection pcs).
> * <P>The affected instance(s) lose their JDO identity and are
> no longer
> @@ -687,7 +724,7 @@
> * @param pcs the array of instances to make transactional.
> * @see #makeTransactional(Object pc)
> */
> - void makeTransactionalAll (Object[] pcs);
> + void makeTransactionalAll (Object... pcs);
>
> /** Make a <code>Collection</code> of instances subject to
> transactional
> * boundaries.
> @@ -713,7 +750,7 @@
> * @param pcs the array of instances to make nontransactional.
> * @see #makeNontransactional(Object pc)
> */
> - void makeNontransactionalAll (Object[] pcs);
> + void makeNontransactionalAll (Object... pcs);
>
> /** Make a <code>Collection</code> of instances non-
> transactional after
> * commit.
> @@ -789,7 +826,7 @@
> * the class to retrieve associated instances.
> * @param pcs the instances
> */
> - void retrieveAll (Object[] pcs);
> + void retrieveAll (Object... pcs);
>
> /** Retrieve field values of instances from the store. This
> tells
> * the <code>PersistenceManager</code> that the application
> intends to use
> @@ -808,10 +845,33 @@
> * @param pcs the instances
> * @param useFetchPlan whether to use the current fetch plan
> to determine
> * which fields to load and which instances to retrieve.
> + * @deprecated
> + * @see #retrieveAll(boolean,Object...)
> * @since 1.0.1
> */
> void retrieveAll (Object[] pcs, boolean useFetchPlan);
>
> + /** Retrieve field values of instances from the store. This
> tells
> + * the <code>PersistenceManager</code> that the application
> intends to use
> + * the instances, and their field values should be retrieved.
> The fields
> + * in the current fetch group must be retrieved, and the
> implementation
> + * might retrieve more fields than the current fetch group.
> + * <P>If the useFetchPlan parameter is false, this method
> behaves exactly
> + * as the corresponding method without the useFetchPlan
> parameter.
> + * If the useFetchPlan parameter is true, and the fetch plan
> has not been
> + * modified from its default setting, all fields in the
> current fetch plan
> + * are fetched, and other fields might be fetched lazily by the
> + * implementation. If the useFetchPlan parameter is true, and
> the fetch
> + * plan has been changed from its default setting, then the
> fields
> + * specified by the fetch plan are loaded, along with related
> instances
> + * specified by the fetch plan.
> + * @param pcs the instances
> + * @param useFetchPlan whether to use the current fetch plan
> to determine
> + * which fields to load and which instances to retrieve.
> + * @since 2.1
> + */
> + void retrieveAll (boolean useFetchPlan, Object... pcs);
> +
> /** The application can manage the <code>PersistenceManager</
> code> instances
> * more easily by having an application object associated with
> each
> * <code>PersistenceManager</code> instance.
> @@ -990,7 +1050,7 @@
> * @see #getFetchPlan
> * @since 2.0
> */
> - <T> T[] detachCopyAll (T[] pcs);
> + <T> T[] detachCopyAll (T... pcs);
>
> /**
> * Put the specified key-value pair into the map of user objects.
> @@ -1105,7 +1165,7 @@
> * @since 2.0
> */
> void addInstanceLifecycleListener (InstanceLifecycleListener
> listener,
> - Class[] classes);
> + Class... classes);
>
> /**
> * Removes the listener instance from the list of lifecycle
> event listeners.
>
> Modified: db/jdo/trunk/api2/src/java/javax/jdo/
> PersistenceManagerFactory.java
> URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/
> jdo/PersistenceManagerFactory.java?
> rev=586545&r1=586544&r2=586545&view=diff
> ======================================================================
> ========
> --- db/jdo/trunk/api2/src/java/javax/jdo/
> PersistenceManagerFactory.java (original)
> +++ db/jdo/trunk/api2/src/java/javax/jdo/
> PersistenceManagerFactory.java Fri Oct 19 10:14:50 2007
> @@ -513,7 +513,7 @@
> * @return the <code>Collection</code> of <code>String</code>s
> representing
> * the supported options.
> */
> - Collection supportedOptions();
> + Collection<String> supportedOptions();
>
> /**
> * Return the {@link DataStoreCache} that this factory uses for
>
> Modified: db/jdo/trunk/api2/src/java/javax/jdo/Query.java
> URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/
> jdo/Query.java?rev=586545&r1=586544&r2=586545&view=diff
> ======================================================================
> ========
> --- db/jdo/trunk/api2/src/java/javax/jdo/Query.java (original)
> +++ db/jdo/trunk/api2/src/java/javax/jdo/Query.java Fri Oct 19
> 10:14:50 2007
> @@ -332,7 +332,7 @@
> * @param parameters the <code>Object</code> array with all of
> the
> * parameters.
> */
> - Object executeWithArray (Object[] parameters);
> + Object executeWithArray (Object... parameters);
>
> /** Get the <code>PersistenceManager</code> associated with this
> * <code>Query</code>.
> @@ -529,7 +529,7 @@
> * @return the number of instances of the candidate class that
> were deleted
> * @since 2.0
> */
> - long deletePersistentAll (Object[] parameters);
> + long deletePersistentAll (Object... parameters);
>
> /**
> * Deletes all the instances of the candidate class that pass the
>
> Modified: db/jdo/trunk/api2/src/java/javax/jdo/datastore/
> DataStoreCache.java
> URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/
> jdo/datastore/DataStoreCache.java?
> rev=586545&r1=586544&r2=586545&view=diff
> ======================================================================
> ========
> --- db/jdo/trunk/api2/src/java/javax/jdo/datastore/
> DataStoreCache.java (original)
> +++ db/jdo/trunk/api2/src/java/javax/jdo/datastore/
> DataStoreCache.java Fri Oct 19 10:14:50 2007
> @@ -52,7 +52,7 @@
> * @param oids the object ids of the instance to evict.
> * @since 2.0
> */
> - void evictAll (Object[] oids);
> + void evictAll (Object... oids);
>
> /** Evict the parameter instances from the second-level cache.
> * @param oids the object ids of the instance to evict.
> @@ -83,7 +83,7 @@
> * @param oids the object ids of the instances to pin.
> * @since 2.0
> */
> - void pinAll (Object[] oids);
> + void pinAll (Object... oids);
>
> /** Pin instances in the second-level cache.
> * @param pcClass the class of instances to pin
> @@ -108,7 +108,7 @@
> * @param oids the object id of the instance to evict.
> * @since 2.0
> */
> - void unpinAll(Object[] oids);
> + void unpinAll(Object... oids);
>
> /** Unpin instances from the second-level cache.
> * @param pcClass the class of instances to unpin
> @@ -134,7 +134,7 @@
> public void evictAll() {
> }
>
> - public void evictAll(Object[] oids) {
> + public void evictAll(Object... oids) {
> }
>
> public void evictAll(Collection oids) {
> @@ -146,7 +146,7 @@
> public void pin(Object oid) {
> }
>
> - public void pinAll(Object[] oids) {
> + public void pinAll(Object... oids) {
> }
>
> public void pinAll(Collection oids) {
> @@ -158,7 +158,7 @@
> public void unpin(Object oid) {
> }
>
> - public void unpinAll(Object[] oids) {
> + public void unpinAll(Object... oids) {
> }
>
> public void unpinAll(Collection oids) {
>
> Modified: db/jdo/trunk/tck2-legacy/src/conf/jdo-2_1-signatures.txt
> URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2-legacy/src/conf/
> jdo-2_1-signatures.txt?rev=586545&r1=586544&r2=586545&view=diff
> ======================================================================
> ========
> --- db/jdo/trunk/tck2-legacy/src/conf/jdo-2_1-signatures.txt
> (original)
> +++ db/jdo/trunk/tck2-legacy/src/conf/jdo-2_1-signatures.txt Fri
> Oct 19 10:14:50 2007
> @@ -639,6 +639,7 @@
> public java.util.Collection getObjectsById
> (java.util.Collection oids, boolean validate);
> public java.util.Collection getObjectsById
> (java.util.Collection oids);
> public Object[] getObjectsById(Object[] oids, boolean validate);
> + public Object[] getObjectsById(boolean validate,Object[] oids);
> public Object[] getObjectsById(Object[] oids);
> public Object makePersistent(Object pc);
> public Object[] makePersistentAll(Object[] pcs);
> @@ -651,6 +652,7 @@
> public void makeTransientAll(java.util.Collection pcs);
> public void makeTransient(Object pc, boolean useFetchPlan);
> public void makeTransientAll(Object[] pcs, boolean useFetchPlan);
> + public void makeTransientAll(boolean useFetchPlan, Object[] pcs);
> public void makeTransientAll(java.util.Collection pcs, boolean
> useFetchPlan);
> public void makeTransactional(Object pc);
> public void makeTransactionalAll(Object[] pcs);
> @@ -664,6 +666,7 @@
> public void retrieveAll(java.util.Collection pcs, boolean
> FGOnly);
> public void retrieveAll(Object[] pcs);
> public void retrieveAll(Object[] pcs, boolean FGOnly);
> + public void retrieveAll(boolean FGOnly, Object[] pcs);
> public void setUserObject(Object o);
> public Object getUserObject();
> public javax.jdo.PersistenceManagerFactory
> getPersistenceManagerFactory();
>
> Modified: db/jdo/trunk/tck2-legacy/src/java/org/apache/jdo/tck/util/
> signature/SignatureVerifier.java
> URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2-legacy/src/java/
> org/apache/jdo/tck/util/signature/SignatureVerifier.java?
> rev=586545&r1=586544&r2=586545&view=diff
> ======================================================================
> ========
> --- db/jdo/trunk/tck2-legacy/src/java/org/apache/jdo/tck/util/
> signature/SignatureVerifier.java (original)
> +++ db/jdo/trunk/tck2-legacy/src/java/org/apache/jdo/tck/util/
> signature/SignatureVerifier.java Fri Oct 19 10:14:50 2007
> @@ -893,6 +893,7 @@
> else if (t.equals("strictfp")) m |= Modifier.STRICT;
> else if (t.equals("synchronized")) m |=
> Modifier.SYNCHRONIZED;
> else if (t.equals("transient")) m |=
> Modifier.TRANSIENT;
> + else if (t.equals("varargs")) m |=
> Modifier.TRANSIENT;
> else if (t.equals("volatile")) m |=
> Modifier.VOLATILE;
> else {
> setLookAhead(t); // not a modifier
>
> Modified: db/jdo/trunk/tck2/src/conf/jdo-2_1-signatures.txt
> URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/conf/
> jdo-2_1-signatures.txt?rev=586545&r1=586544&r2=586545&view=diff
> ======================================================================
> ========
> --- db/jdo/trunk/tck2/src/conf/jdo-2_1-signatures.txt (original)
> +++ db/jdo/trunk/tck2/src/conf/jdo-2_1-signatures.txt Fri Oct 19
> 10:14:50 2007
> @@ -202,16 +202,16 @@
> public interface javax.jdo.datastore.DataStoreCache {
> public void evict(Object oid);
> public void evictAll();
> - public void evictAll(Object[] oids);
> + public varargs void evictAll(Object[] oids);
> public void evictAll(java.util.Collection oids);
> public void evictAll(Class pcClass, boolean subclasses);
> public void pin(Object oid);
> public void pinAll(java.util.Collection oids);
> - public void pinAll(Object[] oids);
> + public varargs void pinAll(Object[] oids);
> public void pinAll(Class pcClass, boolean subclasses);
> public void unpin(Object oid);
> public void unpinAll(java.util.Collection oids);
> - public void unpinAll(Object[] oids);
> + public varargs void unpinAll(Object[] oids);
> public void unpinAll(Class pcClass, boolean subclasses);
> }
>
> @@ -229,7 +229,7 @@
> public long currentValue();
> }
>
> -public interface javax.jdo.Extent {
> +public interface javax.jdo.Extent extends java.lang.Iterable {
> public java.util.Iterator iterator();
> public boolean hasSubclasses();
> public Class getCandidateClass();
> @@ -251,13 +251,13 @@
> public javax.jdo.FetchPlan clearGroups();
> public java.util.Set getGroups();
> public javax.jdo.FetchPlan setGroups(java.util.Collection
> fetchGroupNames);
> - public javax.jdo.FetchPlan setGroups(String[]fetchGroupNames);
> + public varargs javax.jdo.FetchPlan setGroups(String[]
> fetchGroupNames);
> public javax.jdo.FetchPlan setGroup(String fetchGroupName);
> public javax.jdo.FetchPlan setMaxFetchDepth(int fetchDepth);
> public int getMaxFetchDepth();
> public javax.jdo.FetchPlan setDetachmentRoots
> (java.util.Collection roots);
> public java.util.Collection getDetachmentRoots();
> - public javax.jdo.FetchPlan setDetachmentRootClasses(Class[]
> rootClasses);
> + public varargs javax.jdo.FetchPlan setDetachmentRootClasses
> (Class[] rootClasses);
> public Class[] getDetachmentRootClasses();
> public javax.jdo.FetchPlan setFetchSize(int fetchSize);
> public int getFetchSize();
> @@ -609,12 +609,12 @@
> public void close();
> public javax.jdo.Transaction currentTransaction();
> public void evict(Object pc);
> - public void evictAll(Object[] pcs);
> + public varargs void evictAll(Object[] pcs);
> public void evictAll(java.util.Collection pcs);
> public void evictAll(java.lang.Class, boolean);
> public void evictAll();
> public void refresh(Object pc);
> - public void refreshAll(Object[] pcs);
> + public varargs void refreshAll(Object[] pcs);
> public void refreshAll(java.util.Collection pcs);
> public void refreshAll();
> public void refreshAll(javax.jdo.JDOException jdoe);
> @@ -640,31 +640,34 @@
> public java.util.Collection getObjectsById
> (java.util.Collection oids, boolean validate);
> public java.util.Collection getObjectsById
> (java.util.Collection oids);
> public Object[] getObjectsById(Object[] oids, boolean validate);
> - public Object[] getObjectsById(Object[] oids);
> + public varargs Object[] getObjectsById(boolean validate,Object
> [] oids);
> + public varargs Object[] getObjectsById(Object[] oids);
> public Object makePersistent(Object pc);
> - public Object[] makePersistentAll(Object[] pcs);
> + public varargs Object[] makePersistentAll(Object[] pcs);
> public java.util.Collection makePersistentAll
> (java.util.Collection pcs);
> public void deletePersistent(Object pc);
> - public void deletePersistentAll(Object[] pcs);
> + public varargs void deletePersistentAll(Object[] pcs);
> public void deletePersistentAll(java.util.Collection pcs);
> public void makeTransient(Object pc);
> - public void makeTransientAll(Object[] pcs);
> + public varargs void makeTransientAll(Object[] pcs);
> public void makeTransientAll(java.util.Collection pcs);
> public void makeTransient(Object pc, boolean useFetchPlan);
> public void makeTransientAll(Object[] pcs, boolean useFetchPlan);
> + public varargs void makeTransientAll(boolean useFetchPlan,
> Object[] pcs);
> public void makeTransientAll(java.util.Collection pcs, boolean
> useFetchPlan);
> public void makeTransactional(Object pc);
> - public void makeTransactionalAll(Object[] pcs);
> + public varargs void makeTransactionalAll(Object[] pcs);
> public void makeTransactionalAll(java.util.Collection pcs);
> public void makeNontransactional(Object pc);
> - public void makeNontransactionalAll(Object[] pcs);
> + public varargs void makeNontransactionalAll(Object[] pcs);
> public void makeNontransactionalAll(java.util.Collection pcs);
> public void retrieve(Object pc);
> public void retrieve(Object pc, boolean FGOnly);
> public void retrieveAll(java.util.Collection pcs);
> public void retrieveAll(java.util.Collection pcs, boolean
> FGOnly);
> - public void retrieveAll(Object[] pcs);
> + public varargs void retrieveAll(Object[] pcs);
> public void retrieveAll(Object[] pcs, boolean FGOnly);
> + public varargs void retrieveAll(boolean FGOnly, Object[] pcs);
> public void setUserObject(Object o);
> public Object getUserObject();
> public javax.jdo.PersistenceManagerFactory
> getPersistenceManagerFactory();
> @@ -679,7 +682,7 @@
> public void setCopyOnAttach(boolean flag);
> public Object detachCopy(Object pc);
> public java.util.Collection detachCopyAll(java.util.Collection
> pcs);
> - public Object[] detachCopyAll(Object [] pcs);
> + public varargs Object[] detachCopyAll(Object [] pcs);
> public Object putUserObject(Object key, Object val);
> public Object getUserObject(Object key);
> public Object removeUserObject(Object key);
> @@ -690,7 +693,7 @@
> public java.util.Date getServerDate();
> public javax.jdo.datastore.Sequence getSequence(String name);
> public javax.jdo.datastore.JDOConnection getDataStoreConnection
> ();
> - public void addInstanceLifecycleListener
> (javax.jdo.listener.InstanceLifecycleListener listener, Class[]
> classes);
> + public varargs void addInstanceLifecycleListener
> (javax.jdo.listener.InstanceLifecycleListener listener, Class[]
> classes);
> public void removeInstanceLifecycleListener
> (javax.jdo.listener.InstanceLifecycleListener listener);
> }
>
> @@ -770,7 +773,7 @@
> public Object execute(Object p1, Object p2);
> public Object execute(Object p1, Object p2, Object p3);
> public Object executeWithMap(java.util.Map parameters);
> - public Object executeWithArray(Object[] parameters);
> + public varargs Object executeWithArray(Object[] parameters);
> public javax.jdo.PersistenceManager getPersistenceManager();
> public void close(Object queryResult);
> public void closeAll();
> @@ -783,7 +786,7 @@
> public void addExtension(String key, Object value);
> public void setExtensions(java.util.Map extensions);
> public javax.jdo.FetchPlan getFetchPlan();
> - public long deletePersistentAll(Object[] parameters);
> + public varargs long deletePersistentAll(Object[] parameters);
> public long deletePersistentAll(java.util.Map parameters);
> public long deletePersistentAll();
> public void setUnmodifiable();
>
> Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/util/
> signature/SignatureVerifier.java
> URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/
> apache/jdo/tck/util/signature/SignatureVerifier.java?
> rev=586545&r1=586544&r2=586545&view=diff
> ======================================================================
> ========
> --- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/util/signature/
> SignatureVerifier.java (original)
> +++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/util/signature/
> SignatureVerifier.java Fri Oct 19 10:14:50 2007
> @@ -893,6 +893,7 @@
> else if (t.equals("strictfp")) m |= Modifier.STRICT;
> else if (t.equals("synchronized")) m |=
> Modifier.SYNCHRONIZED;
> else if (t.equals("transient")) m |=
> Modifier.TRANSIENT;
> + else if (t.equals("varargs")) m |=
> Modifier.TRANSIENT;
> else if (t.equals("volatile")) m |=
> Modifier.VOLATILE;
> else {
> setLookAhead(t); // not a modifier
>
>
Craig Russell
Architect, Sun Java Enterprise System http://java.sun.com/products/jdo
408 276-5638 mailto:Craig.Russell@sun.com
P.S. A good JDO? O, Gasp!
Re: svn commit: r586545 - in /db/jdo/trunk:
api2-legacy/src/java/javax/jdo/ api2/src/java/javax/jdo/
api2/src/java/javax/jdo/annotations/ api2/src/java/javax/jdo/datastore/
tck2-legacy/src/conf/ tck2-legacy/src/java/org/apache/jdo/tck/util/signature/
tck2/...
Posted by Craig L Russell <Cr...@Sun.COM>.
Hi Andy,
On Oct 19, 2007, at 10:42 AM, Andy Jefferson wrote:
>> Please note that this change, once applied, will not work with JPOX
>> until... umm, when is JPOX going to be updated?
>
> Some time later today hopefully ... so in the next nightly build
> (and if it
> isn't then in the one after that ;-) )
Cool... Can't wait to see it.
Thanks,
Craig
>
>
> --
> Andy (Java Persistent Objects - http://www.jpox.org)
Craig Russell
Architect, Sun Java Enterprise System http://java.sun.com/products/jdo
408 276-5638 mailto:Craig.Russell@sun.com
P.S. A good JDO? O, Gasp!
Re: Fwd: svn commit: r586545 - in /db/jdo/trunk: api2-legacy/src/java/javax/jdo/ api2/src/java/javax/jdo/ api2/src/java/javax/jdo/annotations/ api2/src/java/javax/jdo/datastore/ tck2-legacy/src/conf/ tck2-legacy/src/java/org/apache/jdo/tck/util/signature/ tck2/...
Posted by Andy Jefferson <an...@jpox.org>.
> Please note that this change, once applied, will not work with JPOX
> until... umm, when is JPOX going to be updated?
Some time later today hopefully ... so in the next nightly build (and if it
isn't then in the one after that ;-) )
--
Andy (Java Persistent Objects - http://www.jpox.org)