You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2007/01/31 15:15:45 UTC

svn commit: r501848 - in /cayenne/main/trunk: framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/cspi/CjpaQuery.java pom.xml

Author: aadamchik
Date: Wed Jan 31 06:15:43 2007
New Revision: 501848

URL: http://svn.apache.org/viewvc?view=rev&rev=501848
Log:
upgrading JPA jar to Geronimo version 1.0

Modified:
    cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/cspi/CjpaQuery.java
    cayenne/main/trunk/pom.xml

Modified: cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/cspi/CjpaQuery.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/cspi/CjpaQuery.java?view=diff&rev=501848&r1=501847&r2=501848
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/cspi/CjpaQuery.java (original)
+++ cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/cspi/CjpaQuery.java Wed Jan 31 06:15:43 2007
@@ -24,6 +24,7 @@
 import java.util.List;
 import java.util.Map;
 
+import javax.persistence.FlushModeType;
 import javax.persistence.NoResultException;
 import javax.persistence.NonUniqueResultException;
 import javax.persistence.Query;
@@ -162,6 +163,10 @@
         }
 
         throw new IllegalArgumentException("query does not support maxResult");
+    }
+    
+    public Query setFlushMode(FlushModeType flushModeType) {
+        return this;
     }
 
     /**

Modified: cayenne/main/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/pom.xml?view=diff&rev=501848&r1=501847&r2=501848
==============================================================================
--- cayenne/main/trunk/pom.xml (original)
+++ cayenne/main/trunk/pom.xml Wed Jan 31 06:15:43 2007
@@ -370,8 +370,7 @@
 			<dependency>
 				<groupId>org.apache.geronimo.specs</groupId>
 				<artifactId>geronimo-jpa_3.0_spec</artifactId>
-				<!-- replacing 1.0-SNAPSHOT version with the explicit build number, as the newer builds depend on G 1.2-SNAPSHOT that is not yet posted -->
-				<version>1.0-20060827.051710-1</version>
+				<version>1.0</version>
 			</dependency>
 
 			<dependency>