You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by pc...@apache.org on 2007/04/27 22:46:04 UTC
svn commit: r533218 - in /incubator/openjpa/trunk:
openjpa-kernel/src/main/java/org/apache/openjpa/conf/
openjpa-kernel/src/main/java/org/apache/openjpa/kernel/
openjpa-kernel/src/main/resources/org/apache/openjpa/conf/
openjpa-persistence-jdbc/src/tes...
Author: pcl
Date: Fri Apr 27 13:46:03 2007
New Revision: 533218
URL: http://svn.apache.org/viewvc?view=rev&rev=533218
Log:
OPENJPA-226
Modified:
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfigurationImpl.java
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachManager.java
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachState.java
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/VersionAttachStrategy.java
incubator/openjpa/trunk/openjpa-kernel/src/main/resources/org/apache/openjpa/conf/localizer.properties
incubator/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestGetReferenceAndImplicitDetachment.java
incubator/openjpa/trunk/openjpa-project/src/doc/manual/ref_guide_conf.xml
incubator/openjpa/trunk/openjpa-project/src/doc/manual/ref_guide_remote.xml
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfigurationImpl.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfigurationImpl.java?view=diff&rev=533218&r1=533217&r2=533218
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfigurationImpl.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfigurationImpl.java Fri Apr 27 13:46:03 2007
@@ -360,10 +360,12 @@
addValue(autoDetach);
detachStatePlugin = addPlugin("DetachState", true);
- aliases =
- new String[] { "loaded", DetachOptions.Loaded.class.getName(),
- "fgs", DetachOptions.FetchGroups.class.getName(), "all",
- DetachOptions.All.class.getName(), };
+ aliases = new String[] {
+ "loaded", DetachOptions.Loaded.class.getName(),
+ "fgs", DetachOptions.FetchGroups.class.getName(),
+ "fetch-groups", DetachOptions.FetchGroups.class.getName(),
+ "all", DetachOptions.All.class.getName(),
+ };
detachStatePlugin.setAliases(aliases);
detachStatePlugin.setDefault(aliases[0]);
detachStatePlugin.setString(aliases[0]);
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachManager.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachManager.java?view=diff&rev=533218&r1=533217&r2=533218
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachManager.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachManager.java Fri Apr 27 13:46:03 2007
@@ -162,7 +162,7 @@
// create bitset of fields to detach; if mode is all we can use
// currently loaded bitset clone, since we know all fields are loaded
if (idxs != null) {
- if (detachMode == DETACH_FGS)
+ if (detachMode == DETACH_FETCH_GROUPS)
setFetchGroupFields(broker, sm, idxs);
else
idxs.or(sm.getLoaded());
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachState.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachState.java?view=diff&rev=533218&r1=533217&r2=533218
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachState.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachState.java Fri Apr 27 13:46:03 2007
@@ -28,6 +28,13 @@
/**
* Mode to detach all fields in the current fetch groups.
+ *
+ * @since 0.9.8
+ */
+ public static final int DETACH_FETCH_GROUPS = 0;
+
+ /**
+ * @deprecated
*/
public static final int DETACH_FGS = 0;
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/VersionAttachStrategy.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/VersionAttachStrategy.java?view=diff&rev=533218&r1=533217&r2=533218
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/VersionAttachStrategy.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/VersionAttachStrategy.java Fri Apr 27 13:46:03 2007
@@ -133,7 +133,7 @@
case DETACH_ALL:
attachField(manager, toAttach, sm, fmds[i], true);
break;
- case DETACH_FGS:
+ case DETACH_FETCH_GROUPS:
if (fetch.requiresFetch(fmds[i])
!= FetchConfiguration.FETCH_NONE)
attachField(manager, toAttach, sm, fmds[i], true);
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/resources/org/apache/openjpa/conf/localizer.properties
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/resources/org/apache/openjpa/conf/localizer.properties?view=diff&rev=533218&r1=533217&r2=533218
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/resources/org/apache/openjpa/conf/localizer.properties (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/resources/org/apache/openjpa/conf/localizer.properties Fri Apr 27 13:46:03 2007
@@ -353,7 +353,7 @@
DetachState-name: Detach states
DetachState-desc: Plugin describing the set of field values which will be \
included in the default detach and related options. These states are \
- "loaded", "all", and "fgs".
+ "loaded", "all", and "fetch-groups".
DetachState-type: General
DetachState-cat: Optimization
DetachState-displayorder: 50
Modified: incubator/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestGetReferenceAndImplicitDetachment.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestGetReferenceAndImplicitDetachment.java?view=diff&rev=533218&r1=533217&r2=533218
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestGetReferenceAndImplicitDetachment.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestGetReferenceAndImplicitDetachment.java Fri Apr 27 13:46:03 2007
@@ -30,7 +30,7 @@
extends SingleEMFTestCase {
public void setUp() {
- setUp("openjpa.DetachState", "fgs",
+ setUp("openjpa.DetachState", "fetch-groups",
DetachmentOneManyParent.class, DetachmentOneManyChild.class);
}
Modified: incubator/openjpa/trunk/openjpa-project/src/doc/manual/ref_guide_conf.xml
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-project/src/doc/manual/ref_guide_conf.xml?view=diff&rev=533218&r1=533217&r2=533218
==============================================================================
--- incubator/openjpa/trunk/openjpa-project/src/doc/manual/ref_guide_conf.xml (original)
+++ incubator/openjpa/trunk/openjpa-project/src/doc/manual/ref_guide_conf.xml Fri Apr 27 13:46:03 2007
@@ -1583,7 +1583,7 @@
</para>
<para>
<emphasis role="bold">Possible values: </emphasis><literal>loaded</literal>,
-<literal>fgs</literal>, <literal>all</literal>
+<literal>fetch-groups</literal>, <literal>all</literal>
</para>
<para>
<emphasis role="bold">Description:</emphasis> Determines which fields are part
Modified: incubator/openjpa/trunk/openjpa-project/src/doc/manual/ref_guide_remote.xml
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-project/src/doc/manual/ref_guide_remote.xml?view=diff&rev=533218&r1=533217&r2=533218
==============================================================================
--- incubator/openjpa/trunk/openjpa-project/src/doc/manual/ref_guide_remote.xml (original)
+++ incubator/openjpa/trunk/openjpa-project/src/doc/manual/ref_guide_remote.xml Fri Apr 27 13:46:03 2007
@@ -239,7 +239,7 @@
</listitem>
<listitem>
<para>
-<literal>fgs</literal>: Detach all fields and relations in the current
+<literal>fetch-groups</literal>: Detach all fields and relations in the current
<link linkend="ref_guide_runtime">fetch configuration</link>. For more
information on custom fetch groups, see <xref linkend="ref_guide_fetch"/>.
</para>
@@ -333,7 +333,7 @@
Configuring Detached State
</title>
<programlisting>
-<property name="openjpa.DetachState" value="fgs(DetachedStateField=true)"/>
+<property name="openjpa.DetachState" value="fetch-groups(DetachedStateField=true)"/>
</programlisting>
</example>
<para>
@@ -345,7 +345,7 @@
</para>
<programlisting>
public static final int DETACH_LOADED;
-public static final int DETACH_FGS;
+public static final int DETACH_FETCH_GROUPS;
public static final int DETACH_ALL;
public int getDetachState();
public void setDetachState(int mode);