Author: pcl
Date: Tue Aug 21 15:13:37 2007
New Revision: 568306
URL: http://svn.apache.org/viewvc?rev=568306&view=rev
Log:
OPENJPA-317 -- correction to a method name to better reflect what it does.
Modified:
openjpa/branches/1.0.0/openjpa-kernel/pom.xml
openjpa/branches/1.0.0/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/QueryCacheStoreQuery.java
openjpa/branches/1.0.0/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingFetchConfiguration.java
openjpa/branches/1.0.0/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FetchConfiguration.java
openjpa/branches/1.0.0/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FetchConfigurationImpl.java
openjpa/branches/1.0.0/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCFetchPlan.java
openjpa/branches/1.0.0/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCFetchPlanImpl.java
openjpa/branches/1.0.0/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/FetchPlan.java
openjpa/branches/1.0.0/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/FetchPlanImpl.java
openjpa/branches/1.0.0/openjpa-project/assembly.xml
Modified: openjpa/branches/1.0.0/openjpa-kernel/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.0.0/openjpa-kernel/pom.xml?rev=568306&r1=568305&r2=568306&view=diff
==============================================================================
--- openjpa/branches/1.0.0/openjpa-kernel/pom.xml (original)
+++ openjpa/branches/1.0.0/openjpa-kernel/pom.xml Tue Aug 21 15:13:37 2007
@@ -67,12 +67,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
- <version>1.0.1</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
<version>1.1</version>
<scope>compile</scope>
Modified:
openjpa/branches/1.0.0/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/QueryCacheStoreQuery.java
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.0.0/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/QueryCacheStoreQuery.java?rev=568306&r1=568305&r2=568306&view=diff
==============================================================================
---
openjpa/branches/1.0.0/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/QueryCacheStoreQuery.java
(original)
+++
openjpa/branches/1.0.0/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/QueryCacheStoreQuery.java
Tue Aug 21 15:13:37 2007
@@ -109,7 +109,7 @@
if (qk == null)
return null;
FetchConfiguration fetch = getContext().getFetchConfiguration();
- if (!fetch.getEnlistInQueryCache())
+ if (!fetch.getQueryCacheEnabled())
return null;
if (fetch.getReadLockLevel() > LockLevels.LOCK_NONE)
return null;
Modified:
openjpa/branches/1.0.0/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingFetchConfiguration.java
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.0.0/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingFetchConfiguration.java?rev=568306&r1=568305&r2=568306&view=diff
==============================================================================
---
openjpa/branches/1.0.0/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingFetchConfiguration.java
(original)
+++
openjpa/branches/1.0.0/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingFetchConfiguration.java
Tue Aug 21 15:13:37 2007
@@ -183,17 +183,17 @@
}
}
- public boolean getEnlistInQueryCache() {
+ public boolean getQueryCacheEnabled() {
try {
- return _fetch.getEnlistInQueryCache();
+ return _fetch.getQueryCacheEnabled();
} catch (RuntimeException re) {
throw translate(re);
}
}
- public FetchConfiguration setEnlistInQueryCache(boolean cache) {
+ public FetchConfiguration setQueryCacheEnabled(boolean cache) {
try {
- _fetch.setEnlistInQueryCache(cache);
+ _fetch.setQueryCacheEnabled(cache);
return this;
} catch (RuntimeException re) {
throw translate(re);
Modified:
openjpa/branches/1.0.0/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FetchConfiguration.java
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.0.0/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FetchConfiguration.java?rev=568306&r1=568305&r2=568306&view=diff
==============================================================================
---
openjpa/branches/1.0.0/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FetchConfiguration.java
(original)
+++
openjpa/branches/1.0.0/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FetchConfiguration.java
Tue Aug 21 15:13:37 2007
@@ -129,14 +129,14 @@
* returns <code>false</code>, query caching will not be used
* even if the datacache plugin is installed.
*/
- public boolean getEnlistInQueryCache();
+ public boolean getQueryCacheEnabled();
/**
* Control whether or not query caching is enabled. This has no effect
* if the datacache plugin is not installed, or if the query cache size
* is set to zero.
*/
- public FetchConfiguration setEnlistInQueryCache(boolean cache);
+ public FetchConfiguration setQueryCacheEnabled(boolean cache);
/**
* The query automatic flush configuration.
Modified:
openjpa/branches/1.0.0/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FetchConfigurationImpl.java
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.0.0/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FetchConfigurationImpl.java?rev=568306&r1=568305&r2=568306&view=diff
==============================================================================
---
openjpa/branches/1.0.0/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FetchConfigurationImpl.java
(original)
+++
openjpa/branches/1.0.0/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FetchConfigurationImpl.java
Tue Aug 21 15:13:37 2007
@@ -150,7 +150,7 @@
public void copy(FetchConfiguration fetch) {
setFetchBatchSize(fetch.getFetchBatchSize());
setMaxFetchDepth(fetch.getMaxFetchDepth());
- setEnlistInQueryCache(fetch.getEnlistInQueryCache());
+ setQueryCacheEnabled(fetch.getQueryCacheEnabled());
setFlushBeforeQueries(fetch.getFlushBeforeQueries());
setLockTimeout(fetch.getLockTimeout());
clearFetchGroups();
@@ -191,11 +191,11 @@
return this;
}
- public boolean getEnlistInQueryCache() {
+ public boolean getQueryCacheEnabled() {
return _state.queryCache;
}
- public FetchConfiguration setEnlistInQueryCache(boolean cache) {
+ public FetchConfiguration setQueryCacheEnabled(boolean cache) {
_state.queryCache = cache;
return this;
}
Modified:
openjpa/branches/1.0.0/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCFetchPlan.java
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.0.0/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCFetchPlan.java?rev=568306&r1=568305&r2=568306&view=diff
==============================================================================
---
openjpa/branches/1.0.0/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCFetchPlan.java
(original)
+++
openjpa/branches/1.0.0/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCFetchPlan.java
Tue Aug 21 15:13:37 2007
@@ -136,7 +136,7 @@
public JDBCFetchPlan removeFields(String... fields);
public JDBCFetchPlan removeFields(Collection fields);
public JDBCFetchPlan resetFetchGroups();
- public JDBCFetchPlan setEnlistInQueryResultCache(boolean cache);
+ public JDBCFetchPlan setQueryResultCacheEnabled(boolean cache);
public JDBCFetchPlan setFetchBatchSize(int fetchBatchSize);
public JDBCFetchPlan setLockTimeout(int timeout);
public JDBCFetchPlan setMaxFetchDepth(int depth);
Modified:
openjpa/branches/1.0.0/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCFetchPlanImpl.java
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.0.0/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCFetchPlanImpl.java?rev=568306&r1=568305&r2=568306&view=diff
==============================================================================
---
openjpa/branches/1.0.0/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCFetchPlanImpl.java
(original)
+++
openjpa/branches/1.0.0/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCFetchPlanImpl.java
Tue Aug 21 15:13:37 2007
@@ -225,8 +225,8 @@
}
@Override
- public JDBCFetchPlan setEnlistInQueryResultCache(boolean cache) {
- return (JDBCFetchPlan) super.setEnlistInQueryResultCache(cache);
+ public JDBCFetchPlan setQueryResultCacheEnabled(boolean cache) {
+ return (JDBCFetchPlan) super.setQueryResultCacheEnabled(cache);
}
@Override
Modified:
openjpa/branches/1.0.0/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/FetchPlan.java
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.0.0/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/FetchPlan.java?rev=568306&r1=568305&r2=568306&view=diff
==============================================================================
---
openjpa/branches/1.0.0/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/FetchPlan.java
(original)
+++
openjpa/branches/1.0.0/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/FetchPlan.java
Tue Aug 21 15:13:37 2007
@@ -88,7 +88,7 @@
*
* @since 1.0.0
*/
- public boolean isEnlistInQueryResultCache();
+ public boolean getQueryResultCacheEnabled();
/**
* Control whether or not query caching is enabled. This has no effect
@@ -97,7 +97,7 @@
*
* @since 1.0.0
*/
- public FetchPlan setEnlistInQueryResultCache(boolean cache);
+ public FetchPlan setQueryResultCacheEnabled(boolean cache);
/**
* Returns the names of the fetch groups that this component will use
Modified:
openjpa/branches/1.0.0/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/FetchPlanImpl.java
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.0.0/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/FetchPlanImpl.java?rev=568306&r1=568305&r2=568306&view=diff
==============================================================================
---
openjpa/branches/1.0.0/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/FetchPlanImpl.java
(original)
+++
openjpa/branches/1.0.0/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/FetchPlanImpl.java
Tue Aug 21 15:13:37 2007
@@ -82,12 +82,12 @@
return this;
}
- public boolean isEnlistInQueryResultCache() {
- return _fetch.getEnlistInQueryCache();
+ public boolean getQueryResultCacheEnabled() {
+ return _fetch.getQueryCacheEnabled();
}
- public FetchPlan setEnlistInQueryResultCache(boolean cache) {
- _fetch.setEnlistInQueryCache(cache);
+ public FetchPlan setQueryResultCacheEnabled(boolean cache) {
+ _fetch.setQueryCacheEnabled(cache);
return this;
}
Modified: openjpa/branches/1.0.0/openjpa-project/assembly.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.0.0/openjpa-project/assembly.xml?rev=568306&r1=568305&r2=568306&view=diff
==============================================================================
--- openjpa/branches/1.0.0/openjpa-project/assembly.xml (original)
+++ openjpa/branches/1.0.0/openjpa-project/assembly.xml Tue Aug 21 15:13:37 2007
@@ -106,7 +106,6 @@
<include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
<include>org.apache.geronimo.specs:geronimo-jta_1.0.1B_spec</include>
<include>org.apache.geronimo.specs:geronimo-jpa_3.0_spec</include>
-
<include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include>
</includes>
</dependencySet>
</dependencySets>
