Author: pcl
Date: Tue Aug 21 00:03:48 2007
New Revision: 567986
URL: http://svn.apache.org/viewvc?rev=567986&view=rev
Log:
OPENJPA-317. Some more API Javadoc cleanup, plus a bit of last-minute renaming
and method visibility changes for clarity.
Added:
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/LRSSizeAlgorithm.java
- copied, changed from r567958,
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/LRSSize.java
Removed:
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/LRSSize.java
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingParser.java
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCFetchPlan.java
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCFetchPlanImpl.java
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/MappingTag.java
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/NonpolymorphicType.java
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/PersistenceMappingDefaults.java
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/PersistenceMappingFactory.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestJDBCEnumToKernelConstantMappings.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceXMLMetaDataParser.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/CallbackMode.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Generator.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/MetaDataTag.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManager.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAQuery.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataDefaults.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataFactory.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProviderImpl.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceStrategy.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceUnitInfoImpl.java
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingParser.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingParser.java?rev=567986&r1=567985&r2=567986&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingParser.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingParser.java
Tue Aug 21 00:03:48 2007
@@ -91,6 +91,7 @@
* @author Pinaki Poddar
* @author Steve Kim
* @author Abe White
+ * @nojavadoc
*/
public class AnnotationPersistenceMappingParser
extends AnnotationPersistenceMetaDataParser {
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCFetchPlan.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCFetchPlan.java?rev=567986&r1=567985&r2=567986&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCFetchPlan.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCFetchPlan.java
Tue Aug 21 00:03:48 2007
@@ -77,12 +77,12 @@
/**
* How to determine the size of a large result set.
*/
- public LRSSize getLRSSize();
+ public LRSSizeAlgorithm getLRSSizeAlgorithm();
/**
* How to determine the size of a large result set.
*/
- public JDBCFetchPlan setLRSSize(LRSSize lrsSize);
+ public JDBCFetchPlan setLRSSizeAlgorithm(LRSSizeAlgorithm
lrsSizeAlgorithm);
/**
* SQL join syntax.
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCFetchPlanImpl.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCFetchPlanImpl.java?rev=567986&r1=567985&r2=567986&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCFetchPlanImpl.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCFetchPlanImpl.java
Tue Aug 21 00:03:48 2007
@@ -33,6 +33,7 @@
*
* @since 0.4.0
* @author Abe White
+ * @nojavadoc
*/
public class JDBCFetchPlanImpl
extends FetchPlanImpl
@@ -91,12 +92,12 @@
return this;
}
- public LRSSize getLRSSize() {
- return LRSSize.fromKernelConstant(_fetch.getLRSSize());
+ public LRSSizeAlgorithm getLRSSizeAlgorithm() {
+ return LRSSizeAlgorithm.fromKernelConstant(_fetch.getLRSSize());
}
- public JDBCFetchPlanImpl setLRSSize(LRSSize lrsSize) {
- _fetch.setLRSSize(lrsSize.toKernelConstant());
+ public JDBCFetchPlanImpl setLRSSizeAlgorithm(LRSSizeAlgorithm
lrsSizeAlgorithm) {
+ _fetch.setLRSSize(lrsSizeAlgorithm.toKernelConstant());
return this;
}
Copied:
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/LRSSizeAlgorithm.java
(from r567958,
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/LRSSize.java)
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/LRSSizeAlgorithm.java?p2=openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/LRSSizeAlgorithm.java&p1=openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/LRSSize.java&r1=567958&r2=567986&rev=567986&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/LRSSize.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/LRSSizeAlgorithm.java
Tue Aug 21 00:03:48 2007
@@ -26,14 +26,14 @@
* @since 1.0.0
* @published
*/
-public enum LRSSize {
+public enum LRSSizeAlgorithm {
UNKNOWN(LRSSizes.SIZE_UNKNOWN),
LAST(LRSSizes.SIZE_LAST),
QUERY(LRSSizes.SIZE_QUERY);
private final int lrsConstant;
- private LRSSize(int value) {
+ private LRSSizeAlgorithm(int value) {
lrsConstant = value;
}
@@ -41,7 +41,7 @@
return lrsConstant;
}
- static LRSSize fromKernelConstant(int kernelConstant) {
+ static LRSSizeAlgorithm fromKernelConstant(int kernelConstant) {
switch (kernelConstant) {
case LRSSizes.SIZE_UNKNOWN:
return UNKNOWN;
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/MappingTag.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/MappingTag.java?rev=567986&r1=567985&r2=567986&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/MappingTag.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/MappingTag.java
Tue Aug 21 00:03:48 2007
@@ -27,6 +27,7 @@
* Set of mapping tags used in JPA.
*
* @author Abe White
+ * @nojavadoc
*/
enum MappingTag {
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/NonpolymorphicType.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/NonpolymorphicType.java?rev=567986&r1=567985&r2=567986&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/NonpolymorphicType.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/NonpolymorphicType.java
Tue Aug 21 00:03:48 2007
@@ -29,4 +29,4 @@
EXACT,
JOINABLE,
FALSE
-};
+}
\ No newline at end of file
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/PersistenceMappingDefaults.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/PersistenceMappingDefaults.java?rev=567986&r1=567985&r2=567986&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/PersistenceMappingDefaults.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/PersistenceMappingDefaults.java
Tue Aug 21 00:03:48 2007
@@ -44,6 +44,7 @@
*
* @author Steve Kim
* @author Abe White
+ * @nojavadoc
*/
public class PersistenceMappingDefaults
extends MappingDefaultsImpl {
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/PersistenceMappingFactory.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/PersistenceMappingFactory.java?rev=567986&r1=567985&r2=567986&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/PersistenceMappingFactory.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/PersistenceMappingFactory.java
Tue Aug 21 00:03:48 2007
@@ -32,6 +32,7 @@
*
* @author Abe White
* @since 0.4.0
+ * @nojavadoc
*/
public class PersistenceMappingFactory
extends PersistenceMetaDataFactory {
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestJDBCEnumToKernelConstantMappings.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestJDBCEnumToKernelConstantMappings.java?rev=567986&r1=567985&r2=567986&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestJDBCEnumToKernelConstantMappings.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestJDBCEnumToKernelConstantMappings.java
Tue Aug 21 00:03:48 2007
@@ -59,31 +59,31 @@
public void testLRSSizeType() {
assertEquals(LRSSizes.SIZE_UNKNOWN,
- LRSSize.UNKNOWN.toKernelConstant());
- assertEquals(LRSSize.UNKNOWN,
- LRSSize.fromKernelConstant(
+ LRSSizeAlgorithm.UNKNOWN.toKernelConstant());
+ assertEquals(LRSSizeAlgorithm.UNKNOWN,
+ LRSSizeAlgorithm.fromKernelConstant(
LRSSizes.SIZE_UNKNOWN));
- assertEquals(LRSSize.UNKNOWN.toKernelConstant(),
- LRSSize.UNKNOWN.ordinal());
+ assertEquals(LRSSizeAlgorithm.UNKNOWN.toKernelConstant(),
+ LRSSizeAlgorithm.UNKNOWN.ordinal());
assertEquals(LRSSizes.SIZE_LAST,
- LRSSize.LAST.toKernelConstant());
- assertEquals(LRSSize.LAST,
- LRSSize.fromKernelConstant(
+ LRSSizeAlgorithm.LAST.toKernelConstant());
+ assertEquals(LRSSizeAlgorithm.LAST,
+ LRSSizeAlgorithm.fromKernelConstant(
LRSSizes.SIZE_LAST));
- assertEquals(LRSSize.LAST.toKernelConstant(),
- LRSSize.LAST.ordinal());
+ assertEquals(LRSSizeAlgorithm.LAST.toKernelConstant(),
+ LRSSizeAlgorithm.LAST.ordinal());
assertEquals(LRSSizes.SIZE_QUERY,
- LRSSize.QUERY.toKernelConstant());
- assertEquals(LRSSize.QUERY,
- LRSSize.fromKernelConstant(
+ LRSSizeAlgorithm.QUERY.toKernelConstant());
+ assertEquals(LRSSizeAlgorithm.QUERY,
+ LRSSizeAlgorithm.fromKernelConstant(
LRSSizes.SIZE_QUERY));
- assertEquals(LRSSize.QUERY.toKernelConstant(),
- LRSSize.QUERY.ordinal());
+ assertEquals(LRSSizeAlgorithm.QUERY.toKernelConstant(),
+ LRSSizeAlgorithm.QUERY.ordinal());
assertEquals(getConstantCount(LRSSizes.class),
- LRSSize.values().length);
+ LRSSizeAlgorithm.values().length);
}
public void testJoinSyntaxType() {
Modified:
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceXMLMetaDataParser.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceXMLMetaDataParser.java?rev=567986&r1=567985&r2=567986&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceXMLMetaDataParser.java
(original)
+++
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceXMLMetaDataParser.java
Tue Aug 21 00:03:48 2007
@@ -38,6 +38,7 @@
* JAXB xml annotation metadata parser.
*
* @author Catalina Wei
+ * @since 1.0.0
* @nojavadoc
*/
public class AnnotationPersistenceXMLMetaDataParser {
Modified:
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/CallbackMode.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/CallbackMode.java?rev=567986&r1=567985&r2=567986&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/CallbackMode.java
(original)
+++
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/CallbackMode.java
Tue Aug 21 00:03:48 2007
@@ -42,7 +42,7 @@
callbackMode = value;
}
- public static EnumSet<CallbackMode> toEnumSet(int callback) {
+ static EnumSet<CallbackMode> toEnumSet(int callback) {
EnumSet<CallbackMode> modes = EnumSet.noneOf(CallbackMode.class);
if ((callback & CallbackModes.CALLBACK_FAIL_FAST) != 0)
modes.add(FAIL_FAST);
@@ -57,7 +57,7 @@
return modes;
}
- public static int fromEnumSet(EnumSet<CallbackMode> modes) {
+ static int fromEnumSet(EnumSet<CallbackMode> modes) {
int callback = 0;
for (CallbackMode mode : modes)
callback |= mode.callbackMode;
Modified:
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Generator.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Generator.java?rev=567986&r1=567985&r2=567986&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Generator.java
(original)
+++
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Generator.java
Tue Aug 21 00:03:48 2007
@@ -18,8 +18,6 @@
*/
package org.apache.openjpa.persistence;
-import org.apache.openjpa.kernel.Seq;
-
/**
* Represents a store sequence.
*
Modified:
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/MetaDataTag.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/MetaDataTag.java?rev=567986&r1=567985&r2=567986&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/MetaDataTag.java
(original)
+++
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/MetaDataTag.java
Tue Aug 21 00:03:48 2007
@@ -27,6 +27,7 @@
* Set of metadata tags used in JPA.
*
* @author Abe White
+ * @nojavadoc
*/
public enum MetaDataTag {
// sorted by XML order
Modified:
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManager.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManager.java?rev=567986&r1=567985&r2=567986&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManager.java
(original)
+++
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManager.java
Tue Aug 21 00:03:48 2007
@@ -763,8 +763,9 @@
* JavaBeans convention, this method will create a concrete implementation
* according to the metadata that defines the class. If <code>cls</code>
* is a non-final concrete type that has metadata but does not implement
- * [EMAIL PROTECTED] PersistenceCapable}, this method will create a
subclass of the
- * type that does implement [EMAIL PROTECTED] PersistenceCapable}, and
will attempt
+ * [EMAIL PROTECTED] org.apache.openjpa.enhance.PersistenceCapable}, this
method will
+ * create a subclass of the type that does implement
+ * [EMAIL PROTECTED] org.apache.openjpa.enhance.PersistenceCapable}, and
will attempt
* to redefine the methods in <code>cls</code> to enable persistent
* attribute tracking. Otherwise, this will return an instance of the
* specified class.
Modified:
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAQuery.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAQuery.java?rev=567986&r1=567985&r2=567986&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAQuery.java
(original)
+++
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAQuery.java
Tue Aug 21 00:03:48 2007
@@ -36,7 +36,12 @@
* @published
*/
public interface OpenJPAQuery
- extends Query, QueryHints {
+ extends Query {
+
+ /**
+ * Hint key for specifying the number of rows to optimize for.
+ */
+ public static final String HINT_RESULT_COUNT =
QueryHints.HINT_RESULT_COUNT;
/**
* The owning entity manager.
Modified:
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataDefaults.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataDefaults.java?rev=567986&r1=567985&r2=567986&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataDefaults.java
(original)
+++
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataDefaults.java
Tue Aug 21 00:03:48 2007
@@ -65,6 +65,7 @@
*
* @author Patrick Linskey
* @author Abe White
+ * @nojavadoc
*/
public class PersistenceMetaDataDefaults
extends AbstractMetaDataDefaults {
Modified:
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataFactory.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataFactory.java?rev=567986&r1=567985&r2=567986&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataFactory.java
(original)
+++
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataFactory.java
Tue Aug 21 00:03:48 2007
@@ -65,6 +65,7 @@
*
* @author Steve Kim
* @since 0.4.0
+ * @nojavadoc
*/
public class PersistenceMetaDataFactory
extends AbstractCFMetaDataFactory
Modified:
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProviderImpl.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProviderImpl.java?rev=567986&r1=567985&r2=567986&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProviderImpl.java
(original)
+++
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProviderImpl.java
Tue Aug 21 00:03:48 2007
@@ -23,7 +23,6 @@
import java.security.ProtectionDomain;
import java.util.Map;
import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
import javax.persistence.spi.ClassTransformer;
import javax.persistence.spi.PersistenceProvider;
import javax.persistence.spi.PersistenceUnitInfo;
@@ -68,7 +67,7 @@
* resource or the name of the jar that the resource is contained in.
* This does no pooling of EntityManagersFactories.
*/
- public EntityManagerFactory createEntityManagerFactory(String name,
+ public OpenJPAEntityManagerFactory createEntityManagerFactory(String name,
String resource, Map m) {
PersistenceProductDerivation pd = new PersistenceProductDerivation();
try {
@@ -83,11 +82,12 @@
}
}
- public EntityManagerFactory createEntityManagerFactory(String name, Map m)
{
+ public OpenJPAEntityManagerFactory createEntityManagerFactory(String name,
+ Map m) {
return createEntityManagerFactory(name, null, m);
}
- public EntityManagerFactory createContainerEntityManagerFactory(
+ public OpenJPAEntityManagerFactory createContainerEntityManagerFactory(
PersistenceUnitInfo pui, Map m) {
PersistenceProductDerivation pd = new PersistenceProductDerivation();
try {
Modified:
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceStrategy.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceStrategy.java?rev=567986&r1=567985&r2=567986&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceStrategy.java
(original)
+++
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceStrategy.java
Tue Aug 21 00:03:48 2007
@@ -27,6 +27,7 @@
* Set of field persistence strategies used in JPA.
*
* @author Abe White
+ * @nojavadoc
*/
public enum PersistenceStrategy {
// order matters to match XML spec
Modified:
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceUnitInfoImpl.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceUnitInfoImpl.java?rev=567986&r1=567985&r2=567986&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceUnitInfoImpl.java
(original)
+++
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceUnitInfoImpl.java
Tue Aug 21 00:03:48 2007
@@ -42,7 +42,6 @@
import org.apache.openjpa.lib.util.J2DoPrivHelper;
import org.apache.openjpa.lib.util.Localizer;
import org.apache.openjpa.lib.util.MultiClassLoader;
-import org.apache.openjpa.lib.util.TemporaryClassLoader;
import org.apache.openjpa.util.ClassResolver;
/**