Author: pcl
Date: Wed Jun 11 16:49:12 2008
New Revision: 666907
URL: http://svn.apache.org/viewvc?rev=666907&view=rev
Log:
Merge from ../branches/1.1.x/. svn merge -c 653083 ../branches/1.1.x/
Added:
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/RuntimeUnenhancedClassesModes.java
- copied unchanged from r653083,
openjpa/branches/1.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/RuntimeUnenhancedClassesModes.java
Modified:
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfigurationImpl.java
Modified:
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfigurationImpl.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfigurationImpl.java?rev=666907&r1=666906&r2=666907&view=diff
==============================================================================
---
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfigurationImpl.java
(original)
+++
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfigurationImpl.java
Wed Jun 11 16:49:12 2008
@@ -1409,6 +1409,10 @@
runtimeUnenhancedClasses.set(mode);
}
+ public void setRuntimeUnenhancedClasses(String mode) {
+ runtimeUnenhancedClasses.setString(mode);
+ }
+
public String getCacheMarshallers() {
return cacheMarshallerPlugins.getString();
}
@@ -1421,10 +1425,6 @@
return cacheMarshallerPlugins.getInstancesAsMap();
}
- public void setRuntimeUnenhancedClasses(String mode) {
- runtimeUnenhancedClasses.setString(mode);
- }
-
public void instantiateAll() {
super.instantiateAll();
getMetaDataRepositoryInstance();