DataNucleus

Email Archive: datanucleus-commits (read-only)

2008:	_Jan	_Feb	_Mar (97)	_Apr (765)	_May (572)	_Jun (488)	_Jul (427)	_Aug (666)	_Sep (277)	_Oct (381)	_Nov (422)	_Dec (332)
2009:	_Jan (416)	_Feb (461)	_Mar (506)	_Apr (398)	_May (380)	_Jun (368)	_Jul (383)	_Aug (238)	_Sep (151)	_Oct (213)	_Nov (237)	_Dec (203)
2010:	_Jan (246)	_Feb (290)	_Mar (442)	_Apr (353)	_May (236)	_Jun (369)	_Jul (136)	_Aug (5)	_Sep (55)	_Oct (370)	_Nov (383)	_Dec (292)
2011:	_Jan (358)	_Feb (456)	_Mar (254)	_Apr (135)	_May (208)	_Jun (178)	_Jul (215)	_Aug (103)	_Sep (94)	_Oct (152)	_Nov (114)	_Dec (106)
2012:	_Jan (189)	_Feb (196)	_Mar (160)	_Apr (132)	_May (129)	_Jun (203)	_Jul (338)	_Aug (168)	_Sep (94)	_Oct (299)	_Nov (264)	_Dec (147)
2013:	_Jan (189)	_Feb (184)	_Mar (170)	_Apr (128)	_May (195)	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec

[DataNucleus-commits] SF.net SVN: datanucleus:[10739] platform/core/trunk/src/java/org/ datanucleus/PersistenceConfiguration.java

From: <andy_jefferson@us...> - 2010-10-21 11:02

Revision: 10739
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=10739&view=rev
Author:   andy_jefferson
Date:     2010-10-21 11:02:03 +0000 (Thu, 21 Oct 2010)

Log Message:
-----------
Use convenience method to read persistence properties from a file

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java

Modified: platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java	2010-10-21 10:15:29 UTC (rev 10738)
+++ platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java	2010-10-21 11:02:03 UTC (rev 10739)
@@ -21,11 +21,6 @@
 **********************************************************************/
 package org.datanucleus;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
 import java.util.Calendar;
 import java.util.Collections;
 import java.util.GregorianCalendar;
@@ -44,6 +39,7 @@
 import org.datanucleus.store.ExecutionContext;
 import org.datanucleus.util.Localiser;
 import org.datanucleus.util.NucleusLogger;
+import org.datanucleus.util.PersistenceUtils;
 
 /**
  * Class providing configuration for persistence.
@@ -409,48 +405,21 @@
             return;
         }
 
-        // try to load the properties file
-        Properties props = new Properties();
-        File file = new File(filename);
-        if (file.exists())
+        Properties props = null;
+        try
         {
+            props = PersistenceUtils.setPropertiesUsingFile(filename);
             setPropertyInternal("datanucleus.propertiesFile", filename);
-            try
-            {
-                InputStream is = new FileInputStream(file);
-                props.load(is);
-                is.close();
-            }
-            catch (FileNotFoundException e)
-            {
-                properties.remove("datanucleus.propertiesFile");
-                throw new NucleusUserException(LOCALISER.msg("008014", filename), e).setFatal();
-            }
-            catch (IOException e)
-            {
-                properties.remove("datanucleus.propertiesFile");
-                throw new NucleusUserException(LOCALISER.msg("008014", filename), e).setFatal();
-            }
         }
-        else
+        catch (NucleusUserException nue)
         {
-            // Try to load it as a resource in the CLASSPATH
-            try
-            {
-                InputStream is = PersistenceConfiguration.class.getClassLoader().getResourceAsStream(filename);
-                props.load(is);
-                is.close();
-
-                setPropertyInternal("datanucleus.propertiesFile", filename);
-            }
-            catch (Exception e)
-            {
-                // Still not loadable so throw exception
-                throw new NucleusUserException(LOCALISER.msg("008014", filename), e).setFatal();
-            }
+            properties.remove("datanucleus.propertiesFile");
+            throw nue;
         }
-
-        setPersistenceProperties(props);
+        if (props != null && !props.isEmpty())
+        {
+            setPersistenceProperties(props);
+        }
     }
 
     /**


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[DataNucleus-commits] SF.net SVN: datanucleus:[10741] platform/core/trunk/src/java/org/ datanucleus/PersistenceConfiguration.java

From: <andy_jefferson@us...> - 2010-10-21 12:57

Revision: 10741
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=10741&view=rev
Author:   andy_jefferson
Date:     2010-10-21 12:57:11 +0000 (Thu, 21 Oct 2010)

Log Message:
-----------
Fix for case-sensitivity of property mappings

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java

Modified: platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java	2010-10-21 11:02:45 UTC (rev 10740)
+++ platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java	2010-10-21 12:57:11 UTC (rev 10741)
@@ -116,7 +116,7 @@
                 String name = propElements[i].getAttribute("name");
                 String intName = propElements[i].getAttribute("internal-name");
                 String value = propElements[i].getAttribute("value");
-                propertyMappings.put(name, new PropertyMapping(name, intName, value, 
+                propertyMappings.put(name.toLowerCase(), new PropertyMapping(name, intName, value, 
                     propElements[i].getAttribute("validator")));
 
                 Object systemValue = System.getProperty(name);
@@ -456,7 +456,7 @@
         if (name != null)
         {
             String propertyName = name.trim();
-            PropertyMapping mapping = propertyMappings.get(propertyName);
+            PropertyMapping mapping = propertyMappings.get(propertyName.toLowerCase());
             if (mapping != null)
             {
                 if (mapping.validatorName != null)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[DataNucleus-commits] SF.net SVN: datanucleus:[12808] platform/core/trunk/src/java/org/ datanucleus/PersistenceConfiguration.java

From: <andy_jefferson@us...> - 2011-05-02 09:21

Revision: 12808
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=12808&view=rev
Author:   andy_jefferson
Date:     2011-05-02 09:21:05 +0000 (Mon, 02 May 2011)

Log Message:
-----------
null check

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java

Modified: platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java	2011-04-29 13:49:28 UTC (rev 12807)
+++ platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java	2011-05-02 09:21:05 UTC (rev 12808)
@@ -199,7 +199,7 @@
                 Map.Entry entry = entryIter.next();
                 PropertyMapping mapping = propertyMappings.get(((String)entry.getKey()).toLowerCase());
                 Object propValue = entry.getValue();
-                if (mapping.validatorName != null && propValue instanceof String)
+                if (mapping != null && mapping.validatorName != null && propValue instanceof String)
                 {
                     propValue = getValueForPropertyWithValidator((String)propValue, mapping.validatorName);
                 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[DataNucleus-commits] SF.net SVN: datanucleus:[13947] platform/core/trunk/src/java/org/ datanucleus/PersistenceConfiguration.java

From: <andy_jefferson@us...> - 2011-12-14 18:42

Revision: 13947
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=13947&view=rev
Author:   andy_jefferson
Date:     2011-12-14 18:42:29 +0000 (Wed, 14 Dec 2011)
Log Message:
-----------
[NUCCORE-793] Fix datanucleus.identifier.case value

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java

Modified: platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java	2011-12-14 09:05:45 UTC (rev 13946)
+++ platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java	2011-12-14 18:42:29 UTC (rev 13947)
@@ -385,7 +385,7 @@
         addDefaultIntegerProperty(PropertyNames.PROPERTY_DATASTORE_READ_TIMEOUT, null, null, true, true);
         addDefaultIntegerProperty(PropertyNames.PROPERTY_DATASTORE_WRITE_TIMEOUT, null, null, true, true);
 
-        addDefaultProperty(PropertyNames.PROPERTY_IDENTIFIER_CASE, null, "Quiet",
+        addDefaultProperty(PropertyNames.PROPERTY_IDENTIFIER_CASE, null, null,
             CorePropertyValidator.class.getName(), true, false);
         addDefaultProperty(PropertyNames.PROPERTY_IDENTIFIER_TABLE_PREFIX, null, null, null, true, false);
         addDefaultProperty(PropertyNames.PROPERTY_IDENTIFIER_TABLE_SUFFIX, null, null, null, true, false);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[DataNucleus-commits] SF.net SVN: datanucleus:[15073] platform/core/trunk/src/java/org/ datanucleus/PersistenceConfiguration.java

From: <andy_jefferson@us...> - 2012-07-09 16:18

Revision: 15073
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=15073&view=rev
Author:   andy_jefferson
Date:     2012-07-09 16:18:35 +0000 (Mon, 09 Jul 2012)
Log Message:
-----------
add javadoc comment

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java

Modified: platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java	2012-07-09 10:45:39 UTC (rev 15072)
+++ platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java	2012-07-09 16:18:35 UTC (rev 15073)
@@ -94,6 +94,7 @@
 
     /**
      * Constructor.
+     * Note that you should call setDefaultProperties(PluginManager) after this to initialise it.
      */
     public PersistenceConfiguration()
     {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[DataNucleus-commits] SF.net SVN: datanucleus:[15629] platform/core/trunk/src/java/org/ datanucleus/PersistenceConfiguration.java

From: <andy_jefferson@us...> - 2012-10-04 09:45

Revision: 15629
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=15629&view=rev
Author:   andy_jefferson
Date:     2012-10-04 09:45:11 +0000 (Thu, 04 Oct 2012)
Log Message:
-----------
[NUCCORE-915] Set default for L2 caching embedded/serialised fields as true

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java

Modified: platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java	2012-10-04 09:17:52 UTC (rev 15628)
+++ platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java	2012-10-04 09:45:11 UTC (rev 15629)
@@ -319,7 +319,7 @@
         addDefaultBooleanProperty(PropertyNames.PROPERTY_CACHE_L2_CLEARATCLOSE, null, true, false, false);
         addDefaultIntegerProperty(PropertyNames.PROPERTY_CACHE_L2_TIMEOUT, null, -1, false, false);
         addDefaultIntegerProperty(PropertyNames.PROPERTY_CACHE_L2_BATCHSIZE, null, 100, false, false);
-        addDefaultBooleanProperty(PropertyNames.PROPERTY_CACHE_L2_CACHE_EMBEDDED, null, false, false, false);
+        addDefaultBooleanProperty(PropertyNames.PROPERTY_CACHE_L2_CACHE_EMBEDDED, null, true, false, false);
         addDefaultBooleanProperty(PropertyNames.PROPERTY_CACHE_COLLECTIONS, null, true, false, false);
         addDefaultBooleanProperty(PropertyNames.PROPERTY_CACHE_COLLECTIONS_LAZY, null, null, false, false);
         addDefaultProperty(PropertyNames.PROPERTY_CACHE_QUERYCOMPILE_TYPE, null, "soft", null, false, false);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[DataNucleus-commits] SF.net SVN: datanucleus:[16156] platform/core/trunk/src/java/org/ datanucleus/PersistenceConfiguration.java

From: <andy_jefferson@us...> - 2012-12-03 10:08

Revision: 16156
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=16156&view=rev
Author:   andy_jefferson
Date:     2012-12-03 10:08:29 +0000 (Mon, 03 Dec 2012)
Log Message:
-----------
Add TODO

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java

Modified: platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java	2012-12-03 09:10:25 UTC (rev 16155)
+++ platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java	2012-12-03 10:08:29 UTC (rev 16156)
@@ -123,6 +123,7 @@
             CorePropertyValidator.class.getName(), false, false);
         addDefaultProperty(PropertyNames.PROPERTY_DEFAULT_INHERITANCE_STRATEGY, null, "JDO2", 
             CorePropertyValidator.class.getName(), false, false);
+        // TODO Would be nice to set the default here to "false" but JDO TCK "instanceCallbacks" fails
         addDefaultBooleanProperty(PropertyNames.PROPERTY_FIND_OBJECT_VALIDATE_WHEN_CACHED, null, true, false, true);
         addDefaultBooleanProperty(PropertyNames.PROPERTY_ALLOW_CALLBACKS, null, true, false, true);
         addDefaultProperty(PropertyNames.PROPERTY_DATASTORE_IDENTITY_TYPE, null, "datanucleus", null, false, false);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[DataNucleus-commits] SF.net SVN: datanucleus:[16706] platform/core/trunk/src/java/org/ datanucleus/PersistenceConfiguration.java

From: <andy_jefferson@us...> - 2013-03-06 02:49

Revision: 16706
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=16706&view=rev
Author:   andy_jefferson
Date:     2013-03-06 02:48:54 +0000 (Wed, 06 Mar 2013)
Log Message:
-----------
[NUCCORE-1006] Set default to no ObjectProvider pooling

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java

Modified: platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java	2013-03-06 02:48:25 UTC (rev 16705)
+++ platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java	2013-03-06 02:48:54 UTC (rev 16706)
@@ -118,7 +118,7 @@
         addDefaultBooleanProperty(PropertyNames.PROPERTY_EXECUTION_CONTEXT_REAPER_THREAD, null, false, false, false);
         addDefaultIntegerProperty(PropertyNames.PROPERTY_EXECUTION_CONTEXT_MAX_IDLE, null, 20, false, false);
         addDefaultBooleanProperty(PropertyNames.PROPERTY_OBJECT_PROVIDER_REAPER_THREAD, null, false, false, false);
-        addDefaultIntegerProperty(PropertyNames.PROPERTY_OBJECT_PROVIDER_MAX_IDLE, null, 100, false, false);
+        addDefaultIntegerProperty(PropertyNames.PROPERTY_OBJECT_PROVIDER_MAX_IDLE, null, 0, false, false);
         addDefaultProperty(PropertyNames.PROPERTY_DATASTORE_IDENTITY_TYPE, null, "datanucleus", null, false, false);
         addDefaultProperty(PropertyNames.PROPERTY_IDENTITY_STRING_TRANSLATOR_TYPE, null, null, null, false, false);
         addDefaultProperty(PropertyNames.PROPERTY_IDENTITY_KEY_TRANSLATOR_TYPE, null, null, null, false, false);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[DataNucleus-commits] SF.net SVN: datanucleus:[16837] platform/core/trunk/src/java/org/ datanucleus/PersistenceConfiguration.java

From: <andy_jefferson@us...> - 2013-03-30 10:11

Revision: 16837
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=16837&view=rev
Author:   andy_jefferson
Date:     2013-03-30 10:11:00 +0000 (Sat, 30 Mar 2013)
Log Message:
-----------
[NUCCORE-1022] Make use of properties specified on ExecutionContext

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java

Modified: platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java	2013-03-30 09:41:18 UTC (rev 16836)
+++ platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java	2013-03-30 10:11:00 UTC (rev 16837)
@@ -102,10 +102,10 @@
     {
         // NucleusContext level features
         addDefaultBooleanProperty(PropertyNames.PROPERTY_IGNORE_CACHE, null, false, false, true);
-        addDefaultBooleanProperty(PropertyNames.PROPERTY_OPTIMISTIC, null, false, false, false);
+        addDefaultBooleanProperty(PropertyNames.PROPERTY_OPTIMISTIC, null, false, false, true);
         addDefaultBooleanProperty(PropertyNames.PROPERTY_MULTITHREADED, null, false, false, true);
-        addDefaultBooleanProperty(PropertyNames.PROPERTY_RETAIN_VALUES, null, false, false, false);
-        addDefaultBooleanProperty(PropertyNames.PROPERTY_RESTORE_VALUES, null, false, false, false);
+        addDefaultBooleanProperty(PropertyNames.PROPERTY_RETAIN_VALUES, null, false, false, true);
+        addDefaultBooleanProperty(PropertyNames.PROPERTY_RESTORE_VALUES, null, false, false, true);
         addDefaultProperty(PropertyNames.PROPERTY_JMX_TYPE, null, null, null, false, false);
         addDefaultBooleanProperty(PropertyNames.PROPERTY_ENABLE_STATISTICS, null, false, false, false);
         addDefaultProperty(PropertyNames.PROPERTY_PMF_NAME, null, null, null, false, false);
@@ -142,9 +142,9 @@
         addDefaultProperty(PropertyNames.PROPERTY_TRANSACTION_JTA_JNDI_LOCATION, null, null, null, false, false);
         addDefaultProperty(PropertyNames.PROPERTY_TRANSACTION_ISOLATION, null, "read-committed", 
             CorePropertyValidator.class.getName(), false, false);
-        addDefaultBooleanProperty(PropertyNames.PROPERTY_NONTX_READ, null, true, false, false);
-        addDefaultBooleanProperty(PropertyNames.PROPERTY_NONTX_WRITE, null, true, false, false);
-        addDefaultBooleanProperty(PropertyNames.PROPERTY_NONTX_ATOMIC, null, true, false, false);
+        addDefaultBooleanProperty(PropertyNames.PROPERTY_NONTX_READ, null, true, false, true);
+        addDefaultBooleanProperty(PropertyNames.PROPERTY_NONTX_WRITE, null, true, false, true);
+        addDefaultBooleanProperty(PropertyNames.PROPERTY_NONTX_ATOMIC, null, true, false, true);
 
         // Flush process
         addDefaultIntegerProperty(PropertyNames.PROPERTY_FLUSH_AUTO_OBJECT_LIMIT, null, 1, false, false);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.