svn commit: r1798610 - in /openjpa/branches/2.2.x: openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/conf/ openjpa-kernel/src/main/resources/org/apache/openjpa/conf/ openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

svn commit: r1798610 - in /openjpa/branches/2.2.x: openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/conf/ openjpa-kernel/src/main/resources/org/apache/openjpa/conf/ openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/

jgrassel
Author: jgrassel
Date: Tue Jun 13 15:41:43 2017
New Revision: 1798610

URL: http://svn.apache.org/viewvc?rev=1798610&view=rev
Log:
OPENJPA-2701: Missing localizer.properties (commit on wdazeys behalf)

Modified:
    openjpa/branches/2.2.x/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/conf/localizer.properties
    openjpa/branches/2.2.x/openjpa-kernel/src/main/resources/org/apache/openjpa/conf/localizer.properties
    openjpa/branches/2.2.x/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ConfigurationImpl.java

Modified: openjpa/branches/2.2.x/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/conf/localizer.properties
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/conf/localizer.properties?rev=1798610&r1=1798609&r2=1798610&view=diff
==============================================================================
--- openjpa/branches/2.2.x/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/conf/localizer.properties (original)
+++ openjpa/branches/2.2.x/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/conf/localizer.properties Tue Jun 13 15:41:43 2017
@@ -181,6 +181,28 @@ MappingDefaults-cat: Mappings
 MappingDefaults-displayorder: 50
 MappingDefaults-interface: org.apache.openjpa.jdbc.meta.MappingDefaults
 
+QuerySQLCache-name: Query SQL Cache
+QuerySQLCache-desc: A plugin string describing the options to cache and reuse \
+    SQL statements generated for JPQL queries
+QuerySQLCache-type: General
+QuerySQLCache-cat: Cache.Queries
+QuerySQLCache-displayorder: 50
+
+FinderCache-name: Finder Cache
+FinderCache-desc: A boolean to enable a cache to create and maintain \
+    org.apache.openjpa.kernel.FinderQuery queries
+FinderCache-type: General
+FinderCache-cat: Cache.Queries
+FinderCache-displayorder: 50
+
+IdentifierUtil-name: Identifier Util
+IdentifierUtil-desc: A plugin string defining operations for operating \
+    on strings using identifier rules
+IdentifierUtil-type: General
+IdentifierUtil-cat: JDBC.Advanced
+IdentifierUtil-displayorder: 50
+IdentifierUtil-interface: org.apache.openjpa.lib.identifier.IdentifierUtil
+
 ConnectionDriverName-values: org.hsqldb.jdbcDriver,org.hsql.jdbcDriver,\
  org.h2.Driver,\
  COM.cloudscape.core.JDBCDriver,in.co.daffodil.db.jdbc.DaffodilDBDriver,\

Modified: openjpa/branches/2.2.x/openjpa-kernel/src/main/resources/org/apache/openjpa/conf/localizer.properties
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-kernel/src/main/resources/org/apache/openjpa/conf/localizer.properties?rev=1798610&r1=1798609&r2=1798610&view=diff
==============================================================================
--- openjpa/branches/2.2.x/openjpa-kernel/src/main/resources/org/apache/openjpa/conf/localizer.properties (original)
+++ openjpa/branches/2.2.x/openjpa-kernel/src/main/resources/org/apache/openjpa/conf/localizer.properties Tue Jun 13 15:41:43 2017
@@ -15,6 +15,21 @@
 # specific language governing permissions and limitations
 # under the License.  
 
+Auditor-name: Auditor implementation
+Auditor-desc: The org.apache.openjpa.audit.Auditor implementation \
+    responsible for auditing changes in persistent objects.
+Auditor-type: Persistence
+Auditor-cat: Persistence.Advanced
+Auditor-interface: org.apache.openjpa.audit.Auditor
+
+CacheDistributionPolicy-name: Cache Distribution Policy
+CacheDistributionPolicy-desc: The org.apache.openjpa.datacache.CacheDistributionPolicy \
+    implementation to determine whether a given entity should be cached and \
+    in which named partition of the cache
+CacheDistributionPolicy-type: Persistence
+CacheDistributionPolicy-cat: Persistence.Advanced
+CacheDistributionPolicy-interface: org.apache.openjpa.datacache.CacheDistributionPolicy
+
 ClassResolver-name: Class resolver
 ClassResolver-desc: The org.apache.openjpa.util.ClassResolver implementation \
     that should be used for class resolution.  Defaults to a spec-compliant \
@@ -42,6 +57,13 @@ BrokerImpl-displayorder: 50
 BrokerImpl-expert: true
 BrokerImpl-interface: org.apache.openjpa.kernel.BrokerImpl
 
+Callbacks-name: Callback
+Callbacks-desc: Plugin used to fine tune some of the configurable properties \
+    related to callbacks
+Callbacks-type: General
+Callbacks-type: Persistence.Advanced
+Callbacks-values: PostPersistCallbackImmediate, AllowsMultipleMethodsForSameCallback
+
 DataCache-name: Data cache
 DataCache-desc: Plugin used to cache data loaded from the data store. Must \
  implement org.apache.openjpa.datacache.DataCache.
@@ -68,6 +90,106 @@ DataCacheTimeout-cat: Cache
 DataCacheTimeout-displayorder: 50
 DataCacheTimeout-expert: true
 
+DynamicEnhancementAgent-name: Dynamic Enhancement Agent
+DynamicEnhancementAgent-desc: Controls whether or not OpenJPA will attempt to \
+    dynamically load the PCEnhancer javaagent
+DynamicEnhancementAgent-type: General
+DynamicEnhancementAgent-cat: Persistence.Advanced
+DynamicEnhancementAgent-values: false, true
+
+EncryptionProvider-name: Encryption implementation
+EncryptionProvider-desc: The org.apache.openjpa.lib.encryption.EncryptionProvider implementation \
+    responsible for implementing connection password encryption. Whenever a connection password \
+    is needed, the decrypt(String) method will be invoked
+EncryptionProvider-type: Connecting
+EncryptionProvider-cat: Connecting.Advanced
+EncryptionProvider-interface: org.apache.openjpa.lib.encryption.EncryptionProvider
+
+InitializeEagerly-name: Initialize Eagerly
+InitializeEagerly-desc: Controls whether initialization is eager or lazy. The default behavior is lazy \
+    i.e. persistent classes, database and other resources are initialized only when the \
+    application refers to a resource for the first time
+InitializeEagerly-type: General
+InitializeEagerly-cat: Persistence.Advanced
+InitializeEagerly-values: false, true
+
+Instrumentation-name: Instrumentation
+Instrumentation-desc: A JMX plugin string describing one or more implementations of \
+    org.apache.openjpa.lib.instrumentation.InstrumentationProvider and specific instruments to enable
+Instrumentation-type: General
+Instrumentation-cat: Persistence.Advanced
+
+InstrumentationManager-name: Instrumentation Manager
+InstrumentationManager-desc: Plugin providing methods for initializing multiple providers via \
+    configuration in addition to managing instrumentation providers and the state of the providers
+InstrumentationManager-type: General
+InstrumentationManager-cat: Persistence.Advanced
+InstrumentationManager-interface: org.apache.openjpa.instrumentation.InstrumentationManager
+
+javax.persistence.query.timeout-name: Query Timeout
+javax.persistence.query.timeout-desc: Integer value in milliseconds for query timeout or string \
+    corresponding to integer value
+javax.persistence.query.timeout-type: Persistence
+javax.persistence.query.timeout-cat: Persistence.Advanced
+
+javax.persistence.validation.factory-name: ValidatorFactory implementation
+javax.persistence.validation.factory-desc: Container provided property passing a \
+    javax.validation.ValidatorFactory instance in Java EE Environments
+javax.persistence.validation.factory-type: Validation
+javax.persistence.validation.factory-interface: javax.validation.ValidatorFactory
+
+javax.persistence.validation.mode-name: Validation-Mode
+javax.persistence.validation.mode-desc: Persistence property overriding the \
+    validation mode
+javax.persistence.validation.mode-type: Validation
+javax.persistence.validation.mode-interface: javax.persistence.ValidationMode
+javax.persistence.validation.mode-values: AUTO, CALLBACK, NONE
+
+javax.persistence.validation.group.pre-persist-name: Validation Group Pre-Persist
+javax.persistence.validation.group.pre-persist-desc: Groups that are targeted for\
+   validation upon the pre-persist event
+javax.persistence.validation.group.pre-persist-type: Validation
+
+javax.persistence.validation.group.pre-update-name: Validation Group Pre-Update
+javax.persistence.validation.group.pre-update-desc: Groups that are targeted for\
+   validation upon the pre-update event
+javax.persistence.validation.group.pre-update-type: Validation
+
+javax.persistence.validation.group.pre-remove-name: Validation Group Pre-Remove
+javax.persistence.validation.group.pre-remove-desc: Groups that are targeted for\
+   validation upon the pre-remove event
+javax.persistence.validation.group.pre-remove-type: Validation
+
+javax.persistence.sharedCache.mode-name: Shared Cache Mode
+javax.persistence.sharedCache.mode-desc: Corresponds to the 'shared-cache-mode' element in the persistence.xml
+javax.persistence.sharedCache.mode-type: Persistence
+
+Validator-name: OpenJPA Validator
+Validator-desc: Basic validation interface which defines the contract for event \
+    based validation. Event values are defined in LifeCycleEvent.
+Validator-type: Validation
+Validator-interface: org.apache.openjpa.validation.Validator
+
+LifecycleEventManager-name: Lifecycle Event Manager
+LifecycleEventManager-desc: Manager that can be used to track and notify listeners on lifecycle events
+LifecycleEventManager-interface: org.apache.openjpa.event.LifecycleEventManager
+LifecycleEventManager-type: General
+LifecycleEventManager-cat: Persistence.Advanced
+
+OptimizeIdCopy-name: Optimize Id Copy
+OptimizeIdCopy-desc: Attempt to optimize id class copy operations used \
+    internally by the provider during various ORM operations
+OptimizeIdCopy-type: General
+OptimizeIdCopy-cat: Optimization
+OptimizeIdCopy-values: true, false
+
+PostLoadOnMerge-name: Post Load on Merge
+PostLoadOnMerge-desc: Whether the OpenJPA runtime will trigger a PostLoad \
+    lifecycle event for EntityManager#merge()
+PostLoadOnMerge-type: Persistence
+PostLoadOnMerge-cat: Persistence.Advanced
+PostLoadOnMerge-values: true, false
+
 QueryCache-name: Query cache
 QueryCache-desc: Plugin used to cache query results loaded from the data \
  store. Must implement org.apache.openjpa.datacache.QueryCache.
@@ -88,6 +210,11 @@ QueryCompilationCache-displayorder: 50
 QueryCompilationCache-expert: true
 QueryCompilationCache-interface: java.util.Map
 
+RefreshFromDataCache-name: Refresh DataCache
+RefreshFromDataCache-desc: Used to configure refreshing entities from DataCache
+RefreshFromDataCache-type: General
+RefreshFromDataCache-cat: Optimization
+
 RemoteCommitProvider-name: Remote commit provider
 RemoteCommitProvider-desc: Plugin used to communicate commit information \
  among JVMs. Must implement org.apache.openjpa.event.RemoteCommitProvider.
@@ -97,6 +224,13 @@ RemoteCommitProvider-displayorder: 50
 RemoteCommitProvider-expert: true
 RemoteCommitProvider-interface: org.apache.openjpa.event.RemoteCommitProvider
 
+Specification-name: Specification
+Specification-desc: A formatted string describing the Specification to use \
+    for the default configuration options. The format string is 'name [major.[minor]]'. \
+    'name' denotes the name of the Specification.
+Specification-type: General
+Specification-cat: General
+
 TransactionMode-name: Transaction mode
 TransactionMode-desc: Either "local" or "managed".
 TransactionMode-type: Connecting

Modified: openjpa/branches/2.2.x/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ConfigurationImpl.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ConfigurationImpl.java?rev=1798610&r1=1798609&r2=1798610&view=diff
==============================================================================
--- openjpa/branches/2.2.x/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ConfigurationImpl.java (original)
+++ openjpa/branches/2.2.x/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ConfigurationImpl.java Tue Jun 13 15:41:43 2017
@@ -484,7 +484,9 @@ public class ConfigurationImpl
     private PropertyDescriptor getPropertyDescriptor(Value val)
         throws IntrospectionException {
         String prop = val.getProperty();
-        prop = prop.substring(prop.lastIndexOf('.') + 1);
+        if(!prop.contains("javax.persistence.")) {
+         prop = prop.substring(prop.lastIndexOf('.') + 1);
+        }
 
         // set up property descriptor
         PropertyDescriptor pd;


Loading...