Home / Browse / DataNucleus / Mail / Archive

Donate

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 (300)	_Jun (306)	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec

[DataNucleus-commits] SF.net SVN: datanucleus:[16977] platform

From: <andy_jefferson@us...> - 2013-05-06 10:57

Revision: 16977
          http://sourceforge.net/p/datanucleus/code/16977
Author:   andy_jefferson
Date:     2013-05-06 10:57:09 +0000 (Mon, 06 May 2013)
Log Message:
-----------
[NUCCORE-1038] Move "scoOperationQueue" to "operationQueue" so that it could contain PERSISTs, DELETEs, UPDATEs.

Modified Paths:
--------------
    platform/store.ldap/trunk/META-INF/MANIFEST.MF
    platform/store.ldap/trunk/pom.xml
    platform/store.ldap/trunk/src/java/org/datanucleus/store/ldap/LDAPStoreManager.java
    platform/store.neodatis/trunk/META-INF/MANIFEST.MF
    platform/store.neodatis/trunk/pom.xml
    platform/store.neodatis/trunk/src/java/org/datanucleus/store/neodatis/NeoDatisStoreManager.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/FlushReferential.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/RDBMSStoreManager.java

Modified: platform/store.ldap/trunk/META-INF/MANIFEST.MF
===================================================================
--- platform/store.ldap/trunk/META-INF/MANIFEST.MF	2013-05-06 10:54:56 UTC (rev 16976)
+++ platform/store.ldap/trunk/META-INF/MANIFEST.MF	2013-05-06 10:57:09 UTC (rev 16977)
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: DataNucleus LDAP
 Bundle-SymbolicName: org.datanucleus.store.ldap;singleton:=true
-Bundle-Version: 3.2.1
+Bundle-Version: 3.2.2
 Bundle-Vendor: DataNucleus
 Require-Bundle: org.datanucleus;bundle-version="3.2.2"
 Import-Package: javax.jdo,

Modified: platform/store.ldap/trunk/pom.xml
===================================================================
--- platform/store.ldap/trunk/pom.xml	2013-05-06 10:54:56 UTC (rev 16976)
+++ platform/store.ldap/trunk/pom.xml	2013-05-06 10:57:09 UTC (rev 16977)
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 	<groupId>org.datanucleus</groupId>
-	<version>3.2.1</version>
+	<version>3.2.2-SNAPSHOT</version>
     <artifactId>datanucleus-ldap</artifactId>
     <name>DataNucleus LDAP plugin</name>
     <description>

Modified: platform/store.ldap/trunk/src/java/org/datanucleus/store/ldap/LDAPStoreManager.java
===================================================================
--- platform/store.ldap/trunk/src/java/org/datanucleus/store/ldap/LDAPStoreManager.java	2013-05-06 10:54:56 UTC (rev 16976)
+++ platform/store.ldap/trunk/src/java/org/datanucleus/store/ldap/LDAPStoreManager.java	2013-05-06 10:57:09 UTC (rev 16977)
@@ -24,8 +24,8 @@
 import java.util.Set;
 
 import org.datanucleus.ClassLoaderResolver;
-import org.datanucleus.FlushOrdered;
 import org.datanucleus.NucleusContext;
+import org.datanucleus.flush.FlushOrdered;
 import org.datanucleus.metadata.MetaDataListener;
 import org.datanucleus.store.AbstractStoreManager;
 

Modified: platform/store.neodatis/trunk/META-INF/MANIFEST.MF
===================================================================
--- platform/store.neodatis/trunk/META-INF/MANIFEST.MF	2013-05-06 10:54:56 UTC (rev 16976)
+++ platform/store.neodatis/trunk/META-INF/MANIFEST.MF	2013-05-06 10:57:09 UTC (rev 16977)
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: DataNucleus NeoDatis
 Bundle-SymbolicName: org.datanucleus.store.neodatis;singleton:=true
-Bundle-Version: 3.2.1
+Bundle-Version: 3.2.2
 Bundle-Localization: plugin
 Require-Bundle: org.datanucleus;bundle-version="3.2.2"
 Bundle-Vendor: DataNucleus

Modified: platform/store.neodatis/trunk/pom.xml
===================================================================
--- platform/store.neodatis/trunk/pom.xml	2013-05-06 10:54:56 UTC (rev 16976)
+++ platform/store.neodatis/trunk/pom.xml	2013-05-06 10:57:09 UTC (rev 16977)
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 	<groupId>org.datanucleus</groupId>
-	<version>3.2.1</version>
+	<version>3.2.2-SNAPSHOT</version>
     <artifactId>datanucleus-neodatis</artifactId>
     <name>DataNucleus NeoDatis plugin</name>
     <description>

Modified: platform/store.neodatis/trunk/src/java/org/datanucleus/store/neodatis/NeoDatisStoreManager.java
===================================================================
--- platform/store.neodatis/trunk/src/java/org/datanucleus/store/neodatis/NeoDatisStoreManager.java	2013-05-06 10:54:56 UTC (rev 16976)
+++ platform/store.neodatis/trunk/src/java/org/datanucleus/store/neodatis/NeoDatisStoreManager.java	2013-05-06 10:57:09 UTC (rev 16977)
@@ -25,11 +25,11 @@
 
 import org.datanucleus.ClassLoaderResolver;
 import org.datanucleus.ExecutionContext;
-import org.datanucleus.FlushOrdered;
 import org.datanucleus.NucleusContext;
 import org.datanucleus.PersistenceConfiguration;
 import org.datanucleus.exceptions.ClassNotResolvedException;
 import org.datanucleus.exceptions.NucleusException;
+import org.datanucleus.flush.FlushOrdered;
 import org.datanucleus.identity.OIDFactory;
 import org.datanucleus.metadata.AbstractClassMetaData;
 import org.datanucleus.metadata.AbstractMemberMetaData;

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/FlushReferential.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/FlushReferential.java	2013-05-06 10:54:56 UTC (rev 16976)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/FlushReferential.java	2013-05-06 10:57:09 UTC (rev 16977)
@@ -23,12 +23,12 @@
 import java.util.Set;
 
 import org.datanucleus.ExecutionContext;
-import org.datanucleus.FlushNonReferential;
-import org.datanucleus.FlushOrdered;
 import org.datanucleus.exceptions.NucleusOptimisticException;
 import org.datanucleus.metadata.AbstractClassMetaData;
 import org.datanucleus.state.ObjectProvider;
 import org.datanucleus.store.rdbms.table.ClassTable;
+import org.datanucleus.flush.FlushNonReferential;
+import org.datanucleus.flush.FlushOrdered;
 import org.datanucleus.flush.OperationQueue;
 
 /**

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/RDBMSStoreManager.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/RDBMSStoreManager.java	2013-05-06 10:54:56 UTC (rev 16976)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/RDBMSStoreManager.java	2013-05-06 10:57:09 UTC (rev 16977)
@@ -72,13 +72,13 @@
 import org.datanucleus.ClassLoaderResolver;
 import org.datanucleus.ExecutionContext;
 import org.datanucleus.FetchPlan;
-import org.datanucleus.FlushOrdered;
 import org.datanucleus.NucleusContext;
 import org.datanucleus.PropertyNames;
 import org.datanucleus.api.ApiAdapter;
 import org.datanucleus.exceptions.NucleusDataStoreException;
 import org.datanucleus.exceptions.NucleusException;
 import org.datanucleus.exceptions.NucleusUserException;
+import org.datanucleus.flush.FlushOrdered;
 import org.datanucleus.identity.OID;
 import org.datanucleus.identity.SCOID;
 import org.datanucleus.metadata.AbstractClassMetaData;

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

[DataNucleus-commits] SF.net SVN: datanucleus:[16983] platform

From: <andy_jefferson@us...> - 2013-05-07 07:58

Revision: 16983
          http://sourceforge.net/p/datanucleus/code/16983
Author:   andy_jefferson
Date:     2013-05-07 07:58:27 +0000 (Tue, 07 May 2013)
Log Message:
-----------
[NUCCORE-1040] Support L2 cache retrieve/store modes

Modified Paths:
--------------
    platform/api.jpa/trunk/plugin.xml
    platform/core/trunk/src/java/org/datanucleus/ExecutionContextImpl.java
    platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java
    platform/core/trunk/src/java/org/datanucleus/PropertyNames.java
    platform/core/trunk/src/java/org/datanucleus/properties/CorePropertyValidator.java

Modified: platform/api.jpa/trunk/plugin.xml
===================================================================
--- platform/api.jpa/trunk/plugin.xml	2013-05-07 07:06:42 UTC (rev 16982)
+++ platform/api.jpa/trunk/plugin.xml	2013-05-07 07:58:27 UTC (rev 16983)
@@ -45,6 +45,10 @@
         <persistence-property name="javax.persistence.provider"/> <!-- Unused -->
         <persistence-property name="javax.persistence.sharedCache.mode"
             internal-name="datanucleus.cache.level2.mode"/>
+        <persistence-property name="javax.persistence.cache.retrieveMode"
+            internal-name="datanucleus.cache.level2.retrieveMode"/>
+        <persistence-property name="javax.persistence.cache.storeMode"
+            internal-name="datanucleus.cache.level2.storeMode"/>
 
         <persistence-property name="javax.persistence.validation.mode"
             internal-name="datanucleus.validation.mode"/>

Modified: platform/core/trunk/src/java/org/datanucleus/ExecutionContextImpl.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/ExecutionContextImpl.java	2013-05-07 07:06:42 UTC (rev 16982)
+++ platform/core/trunk/src/java/org/datanucleus/ExecutionContextImpl.java	2013-05-07 07:58:27 UTC (rev 16983)
@@ -4230,6 +4230,12 @@
         {
             return;
         }
+        String cacheStoreMode = getLevel2CacheStoreMode();
+        if (cacheStoreMode.equalsIgnoreCase("bypass"))
+        {
+            // L2 cache storage turned off right now
+            return;
+        }
 
         // Process all modified objects adding/updating/removing from L2 cache as appropriate
         Set<ObjectProvider> opsToCache = null;
@@ -4795,6 +4801,26 @@
 
     // -------------------------------------- Cache Management ---------------------------------------
 
+    protected String getLevel2CacheRetrieveMode()
+    {
+        String setting = (String)getProperty(PropertyNames.PROPERTY_CACHE_L2_RETRIEVE_MODE);
+        if (setting == null)
+        {
+            setting = nucCtx.getPersistenceConfiguration().getStringProperty(PropertyNames.PROPERTY_CACHE_L2_RETRIEVE_MODE);
+        }
+        return setting;
+    }
+
+    protected String getLevel2CacheStoreMode()
+    {
+        String setting = (String)getProperty(PropertyNames.PROPERTY_CACHE_L2_STORE_MODE);
+        if (setting == null)
+        {
+            setting = nucCtx.getPersistenceConfiguration().getStringProperty(PropertyNames.PROPERTY_CACHE_L2_STORE_MODE);
+        }
+        return setting;
+    }
+
     /**
      * Convenience method to add an object to the L1 cache.
      * @param op The ObjectProvider
@@ -4847,6 +4873,12 @@
             return;
         }
 
+        String storeMode = getLevel2CacheStoreMode();
+        if (storeMode.equalsIgnoreCase("bypass"))
+        {
+            return;
+        }
+
         if (txCachedIds != null && !txCachedIds.contains(op.getInternalObjectId()))
         {
             // Object hasn't been modified in this transaction so put in the L2 cache
@@ -5186,12 +5218,19 @@
      * @param id Id of the object
      * @return Persistable object (with connected ObjectProvider).
      */
-    public Object getObjectFromLevel2Cache(Object id)
+    protected Object getObjectFromLevel2Cache(Object id)
     {
         Object pc = null;
 
         if (hasLevel2Cache)
         {
+            String cacheRetrieveMode = getLevel2CacheRetrieveMode();
+            if (cacheRetrieveMode.equalsIgnoreCase("bypass"))
+            {
+                // Cache retrieval currently turned off
+                return null;
+            }
+
             Level2Cache l2Cache = nucCtx.getLevel2Cache();
             CachedPC cachedPC = l2Cache.get(id);
 

Modified: platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java	2013-05-07 07:06:42 UTC (rev 16982)
+++ platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java	2013-05-07 07:58:27 UTC (rev 16983)
@@ -293,6 +293,11 @@
         addDefaultBooleanProperty(PropertyNames.PROPERTY_CACHE_L2_WRITE_THROUGH, null, true, false, false);
         addDefaultBooleanProperty(PropertyNames.PROPERTY_CACHE_L2_STATISTICS_ENABLED, null, false, false, false);
         addDefaultBooleanProperty(PropertyNames.PROPERTY_CACHE_L2_STORE_BY_VALUE, null, true, false, false);
+        addDefaultProperty(PropertyNames.PROPERTY_CACHE_L2_RETRIEVE_MODE, null, "use", 
+            CorePropertyValidator.class.getName(), false, true);
+        addDefaultProperty(PropertyNames.PROPERTY_CACHE_L2_STORE_MODE, null, "use", 
+            CorePropertyValidator.class.getName(), false, true);
+
         addDefaultProperty(PropertyNames.PROPERTY_CACHE_QUERYCOMPILE_TYPE, null, "soft", null, false, false);
         addDefaultProperty(PropertyNames.PROPERTY_CACHE_QUERYCOMPILEDATASTORE_TYPE, null, "soft", null, false, false);
         addDefaultProperty(PropertyNames.PROPERTY_CACHE_QUERYRESULTS_TYPE, null, "soft", null, false, false);

Modified: platform/core/trunk/src/java/org/datanucleus/PropertyNames.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/PropertyNames.java	2013-05-07 07:06:42 UTC (rev 16982)
+++ platform/core/trunk/src/java/org/datanucleus/PropertyNames.java	2013-05-07 07:58:27 UTC (rev 16983)
@@ -131,6 +131,8 @@
     public static final String PROPERTY_CACHE_L2_WRITE_THROUGH = "datanucleus.cache.level2.writeThrough";
     public static final String PROPERTY_CACHE_L2_STORE_BY_VALUE = "datanucleus.cache.level2.storeByValue";
     public static final String PROPERTY_CACHE_L2_STATISTICS_ENABLED = "datanucleus.cache.level2.statisticsEnabled";
+    public static final String PROPERTY_CACHE_L2_RETRIEVE_MODE = "datanucleus.cache.level2.retrieveMode";
+    public static final String PROPERTY_CACHE_L2_STORE_MODE = "datanucleus.cache.level2.storeMode";
 
     public static final String PROPERTY_CACHE_QUERYCOMPILE_TYPE = "datanucleus.cache.queryCompilation.type";
     public static final String PROPERTY_CACHE_QUERYCOMPILEDATASTORE_TYPE = "datanucleus.cache.queryCompilationDatastore.type";

Modified: platform/core/trunk/src/java/org/datanucleus/properties/CorePropertyValidator.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/properties/CorePropertyValidator.java	2013-05-07 07:06:42 UTC (rev 16982)
+++ platform/core/trunk/src/java/org/datanucleus/properties/CorePropertyValidator.java	2013-05-07 07:58:27 UTC (rev 16983)
@@ -285,6 +285,31 @@
                 }
             }
         }
+        else if (name.equalsIgnoreCase(PropertyNames.PROPERTY_CACHE_L2_RETRIEVE_MODE))
+        {
+            if (value instanceof String)
+            {
+                String strVal = (String)value;
+                if (strVal.equalsIgnoreCase("use") ||
+                    strVal.equalsIgnoreCase("bypass"))
+                {
+                    return true;
+                }
+            }
+        }
+        else if (name.equalsIgnoreCase(PropertyNames.PROPERTY_CACHE_L2_STORE_MODE))
+        {
+            if (value instanceof String)
+            {
+                String strVal = (String)value;
+                if (strVal.equalsIgnoreCase("use") ||
+                    strVal.equalsIgnoreCase("bypass") ||
+                    strVal.equalsIgnoreCase("refresh"))
+                {
+                    return true;
+                }
+            }
+        }
         return false;
     }
 }
\ No newline at end of file

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

[DataNucleus-commits] SF.net SVN: datanucleus:[16985] platform

From: <andy_jefferson@us...> - 2013-05-07 08:13

Revision: 16985
          http://sourceforge.net/p/datanucleus/code/16985
Author:   andy_jefferson
Date:     2013-05-07 08:13:46 +0000 (Tue, 07 May 2013)
Log Message:
-----------


Modified Paths:
--------------
    platform/jdo.query/trunk/src/java/org/datanucleus/jdo/query/JDOQueryProcessor.java
    platform/jpa.query/trunk/src/java/org/datanucleus/jpa/query/JPACriteriaProcessor.java

Modified: platform/jdo.query/trunk/src/java/org/datanucleus/jdo/query/JDOQueryProcessor.java
===================================================================
--- platform/jdo.query/trunk/src/java/org/datanucleus/jdo/query/JDOQueryProcessor.java	2013-05-07 08:08:53 UTC (rev 16984)
+++ platform/jdo.query/trunk/src/java/org/datanucleus/jdo/query/JDOQueryProcessor.java	2013-05-07 08:13:46 UTC (rev 16985)
@@ -650,7 +650,7 @@
     public TypeElement getPersistentSupertype(TypeElement element)
     {
         TypeMirror superType = element.getSuperclass();
-        if (superType == null || (element != null && "java.lang.Object".equals(element.toString())))
+        if (superType == null || "java.lang.Object".equals(element.toString()))
         {
             return null;
         }

Modified: platform/jpa.query/trunk/src/java/org/datanucleus/jpa/query/JPACriteriaProcessor.java
===================================================================
--- platform/jpa.query/trunk/src/java/org/datanucleus/jpa/query/JPACriteriaProcessor.java	2013-05-07 08:08:53 UTC (rev 16984)
+++ platform/jpa.query/trunk/src/java/org/datanucleus/jpa/query/JPACriteriaProcessor.java	2013-05-07 08:13:46 UTC (rev 16985)
@@ -343,7 +343,7 @@
     public TypeElement getPersistentSupertype(TypeElement element)
     {
         TypeMirror superType = element.getSuperclass();
-        if (superType == null || (element != null && "java.lang.Object".equals(element.toString())))
+        if (superType == null || "java.lang.Object".equals(element.toString()))
         {
             return 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:[16987] platform

From: <andy_jefferson@us...> - 2013-05-07 10:37

Revision: 16987
          http://sourceforge.net/p/datanucleus/code/16987
Author:   andy_jefferson
Date:     2013-05-07 10:37:09 +0000 (Tue, 07 May 2013)
Log Message:
-----------
fix file URL for snapshot deploy

Modified Paths:
--------------
    platform/api.jdo/trunk/pom.xml
    platform/api.jpa/trunk/pom.xml
    platform/api.rest/trunk/pom.xml
    platform/cache/trunk/pom.xml
    platform/core/trunk/pom.xml
    platform/jdo.connector/trunk/pom.xml
    platform/jdo.query/trunk/pom.xml
    platform/jpa.query/trunk/pom.xml
    platform/store.excel/trunk/pom.xml
    platform/store.hbase/trunk/pom.xml
    platform/store.json/trunk/pom.xml
    platform/store.ldap/trunk/pom.xml
    platform/store.mongodb/trunk/pom.xml
    platform/store.neo4j/trunk/pom.xml
    platform/store.neodatis/trunk/pom.xml
    platform/store.odf/trunk/pom.xml
    platform/store.rdbms/trunk/pom.xml
    platform/store.types.awtgeom/trunk/pom.xml
    platform/store.types.google.collections/trunk/pom.xml
    platform/store.types.jodatime/trunk/pom.xml
    platform/store.types.spatial/trunk/pom.xml
    platform/store.xml/trunk/pom.xml

Modified: platform/api.jdo/trunk/pom.xml
===================================================================
--- platform/api.jdo/trunk/pom.xml	2013-05-07 09:56:14 UTC (rev 16986)
+++ platform/api.jdo/trunk/pom.xml	2013-05-07 10:37:09 UTC (rev 16987)
@@ -55,7 +55,7 @@
         <snapshotRepository>
             <id>datanucleus-nightly</id>
             <name>DataNucleus Nightly</name>
-            <url>file:/home/jpox/htdocs/downloads/maven2-nightly/</url>
+            <url>file:~/htdocs/downloads/maven2-nightly/</url>
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
         <!--repository>

Modified: platform/api.jpa/trunk/pom.xml
===================================================================
--- platform/api.jpa/trunk/pom.xml	2013-05-07 09:56:14 UTC (rev 16986)
+++ platform/api.jpa/trunk/pom.xml	2013-05-07 10:37:09 UTC (rev 16987)
@@ -55,7 +55,7 @@
         <snapshotRepository>
             <id>datanucleus-nightly</id>
             <name>DataNucleus Nightly</name>
-            <url>file:/home/jpox/htdocs/downloads/maven2-nightly/</url>
+            <url>file:~/htdocs/downloads/maven2-nightly/</url>
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
         <!--repository>

Modified: platform/api.rest/trunk/pom.xml
===================================================================
--- platform/api.rest/trunk/pom.xml	2013-05-07 09:56:14 UTC (rev 16986)
+++ platform/api.rest/trunk/pom.xml	2013-05-07 10:37:09 UTC (rev 16987)
@@ -56,7 +56,7 @@
         <snapshotRepository>
             <id>datanucleus-nightly</id>
             <name>DataNucleus Nightly</name>
-            <url>file:/home/jpox/htdocs/downloads/maven2-nightly/</url>
+            <url>file:~/htdocs/downloads/maven2-nightly/</url>
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
         <!--repository>

Modified: platform/cache/trunk/pom.xml
===================================================================
--- platform/cache/trunk/pom.xml	2013-05-07 09:56:14 UTC (rev 16986)
+++ platform/cache/trunk/pom.xml	2013-05-07 10:37:09 UTC (rev 16987)
@@ -45,7 +45,7 @@
         <snapshotRepository>
             <id>datanucleus-nightly</id>
             <name>DataNucleus Nightly</name>
-            <url>file:/home/jpox/htdocs/downloads/maven2-nightly/</url>
+            <url>file:~/htdocs/downloads/maven2-nightly/</url>
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
         <repository>

Modified: platform/core/trunk/pom.xml
===================================================================
--- platform/core/trunk/pom.xml	2013-05-07 09:56:14 UTC (rev 16986)
+++ platform/core/trunk/pom.xml	2013-05-07 10:37:09 UTC (rev 16987)
@@ -56,7 +56,7 @@
         <snapshotRepository>
             <id>datanucleus-nightly</id>
             <name>DataNucleus Nightly</name>
-            <url>file:/home/jpox/htdocs/downloads/maven2-nightly/</url>
+            <url>file:~/htdocs/downloads/maven2-nightly/</url>
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
         <!--repository>

Modified: platform/jdo.connector/trunk/pom.xml
===================================================================
--- platform/jdo.connector/trunk/pom.xml	2013-05-07 09:56:14 UTC (rev 16986)
+++ platform/jdo.connector/trunk/pom.xml	2013-05-07 10:37:09 UTC (rev 16987)
@@ -48,7 +48,7 @@
         <snapshotRepository>
             <id>datanucleus-nightly</id>
             <name>DataNucleus Nightly</name>
-            <url>file:/home/jpox/htdocs/downloads/maven2-nightly/</url>
+            <url>file:~/htdocs/downloads/maven2-nightly/</url>
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
         <repository>

Modified: platform/jdo.query/trunk/pom.xml
===================================================================
--- platform/jdo.query/trunk/pom.xml	2013-05-07 09:56:14 UTC (rev 16986)
+++ platform/jdo.query/trunk/pom.xml	2013-05-07 10:37:09 UTC (rev 16987)
@@ -46,7 +46,7 @@
         <snapshotRepository>
             <id>datanucleus-nightly</id>
             <name>DataNucleus Nightly</name>
-            <url>file:/home/jpox/htdocs/downloads/maven2-nightly/</url>
+            <url>file:~/htdocs/downloads/maven2-nightly/</url>
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
         <repository>

Modified: platform/jpa.query/trunk/pom.xml
===================================================================
--- platform/jpa.query/trunk/pom.xml	2013-05-07 09:56:14 UTC (rev 16986)
+++ platform/jpa.query/trunk/pom.xml	2013-05-07 10:37:09 UTC (rev 16987)
@@ -46,7 +46,7 @@
         <snapshotRepository>
             <id>datanucleus-nightly</id>
             <name>DataNucleus Nightly</name>
-            <url>file:/home/jpox/htdocs/downloads/maven2-nightly/</url>
+            <url>file:~/htdocs/downloads/maven2-nightly/</url>
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
         <repository>

Modified: platform/store.excel/trunk/pom.xml
===================================================================
--- platform/store.excel/trunk/pom.xml	2013-05-07 09:56:14 UTC (rev 16986)
+++ platform/store.excel/trunk/pom.xml	2013-05-07 10:37:09 UTC (rev 16987)
@@ -55,7 +55,7 @@
         <snapshotRepository>
             <id>datanucleus-nightly</id>
             <name>DataNucleus Nightly</name>
-            <url>file:/home/jpox/htdocs/downloads/maven2-nightly/</url>
+            <url>file:~/htdocs/downloads/maven2-nightly/</url>
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
         <!--repository>

Modified: platform/store.hbase/trunk/pom.xml
===================================================================
--- platform/store.hbase/trunk/pom.xml	2013-05-07 09:56:14 UTC (rev 16986)
+++ platform/store.hbase/trunk/pom.xml	2013-05-07 10:37:09 UTC (rev 16987)
@@ -55,7 +55,7 @@
         <snapshotRepository>
             <id>datanucleus-nightly</id>
             <name>DataNucleus Nightly</name>
-            <url>file:/home/jpox/htdocs/downloads/maven2-nightly/</url>
+            <url>file:~/htdocs/downloads/maven2-nightly/</url>
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
         <!--repository>

Modified: platform/store.json/trunk/pom.xml
===================================================================
--- platform/store.json/trunk/pom.xml	2013-05-07 09:56:14 UTC (rev 16986)
+++ platform/store.json/trunk/pom.xml	2013-05-07 10:37:09 UTC (rev 16987)
@@ -55,7 +55,7 @@
         <snapshotRepository>
             <id>datanucleus-nightly</id>
             <name>DataNucleus Nightly</name>
-            <url>file:/home/jpox/htdocs/downloads/maven2-nightly/</url>
+            <url>file:~/htdocs/downloads/maven2-nightly/</url>
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
         <!--repository>

Modified: platform/store.ldap/trunk/pom.xml
===================================================================
--- platform/store.ldap/trunk/pom.xml	2013-05-07 09:56:14 UTC (rev 16986)
+++ platform/store.ldap/trunk/pom.xml	2013-05-07 10:37:09 UTC (rev 16987)
@@ -55,7 +55,7 @@
         <snapshotRepository>
             <id>datanucleus-nightly</id>
             <name>DataNucleus Nightly</name>
-            <url>file:/home/jpox/htdocs/downloads/maven2-nightly/</url>
+            <url>file:~/htdocs/downloads/maven2-nightly/</url>
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
         <!--repository>

Modified: platform/store.mongodb/trunk/pom.xml
===================================================================
--- platform/store.mongodb/trunk/pom.xml	2013-05-07 09:56:14 UTC (rev 16986)
+++ platform/store.mongodb/trunk/pom.xml	2013-05-07 10:37:09 UTC (rev 16987)
@@ -55,7 +55,7 @@
         <snapshotRepository>
             <id>datanucleus-nightly</id>
             <name>DataNucleus Nightly</name>
-            <url>file:/home/jpox/htdocs/downloads/maven2-nightly/</url>
+            <url>file:~/htdocs/downloads/maven2-nightly/</url>
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
         <!--repository>

Modified: platform/store.neo4j/trunk/pom.xml
===================================================================
--- platform/store.neo4j/trunk/pom.xml	2013-05-07 09:56:14 UTC (rev 16986)
+++ platform/store.neo4j/trunk/pom.xml	2013-05-07 10:37:09 UTC (rev 16987)
@@ -55,7 +55,7 @@
         <snapshotRepository>
             <id>datanucleus-nightly</id>
             <name>DataNucleus Nightly</name>
-            <url>file:/home/jpox/htdocs/downloads/maven2-nightly/</url>
+            <url>file:~/htdocs/downloads/maven2-nightly/</url>
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
         <!--repository>

Modified: platform/store.neodatis/trunk/pom.xml
===================================================================
--- platform/store.neodatis/trunk/pom.xml	2013-05-07 09:56:14 UTC (rev 16986)
+++ platform/store.neodatis/trunk/pom.xml	2013-05-07 10:37:09 UTC (rev 16987)
@@ -55,7 +55,7 @@
         <snapshotRepository>
             <id>datanucleus-nightly</id>
             <name>DataNucleus Nightly</name>
-            <url>file:/home/jpox/htdocs/downloads/maven2-nightly/</url>
+            <url>file:~/htdocs/downloads/maven2-nightly/</url>
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
         <!--repository>

Modified: platform/store.odf/trunk/pom.xml
===================================================================
--- platform/store.odf/trunk/pom.xml	2013-05-07 09:56:14 UTC (rev 16986)
+++ platform/store.odf/trunk/pom.xml	2013-05-07 10:37:09 UTC (rev 16987)
@@ -55,7 +55,7 @@
         <snapshotRepository>
             <id>datanucleus-nightly</id>
             <name>DataNucleus Nightly</name>
-            <url>file:/home/jpox/htdocs/downloads/maven2-nightly/</url>
+            <url>file:~/htdocs/downloads/maven2-nightly/</url>
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
         <!--repository>

Modified: platform/store.rdbms/trunk/pom.xml
===================================================================
--- platform/store.rdbms/trunk/pom.xml	2013-05-07 09:56:14 UTC (rev 16986)
+++ platform/store.rdbms/trunk/pom.xml	2013-05-07 10:37:09 UTC (rev 16987)
@@ -55,7 +55,7 @@
         <snapshotRepository>
             <id>datanucleus-nightly</id>
             <name>DataNucleus Nightly</name>
-            <url>file:/home/jpox/htdocs/downloads/maven2-nightly/</url>
+            <url>file:~/htdocs/downloads/maven2-nightly/</url>
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
         <!--repository>

Modified: platform/store.types.awtgeom/trunk/pom.xml
===================================================================
--- platform/store.types.awtgeom/trunk/pom.xml	2013-05-07 09:56:14 UTC (rev 16986)
+++ platform/store.types.awtgeom/trunk/pom.xml	2013-05-07 10:37:09 UTC (rev 16987)
@@ -51,7 +51,7 @@
         <snapshotRepository>
             <id>datanucleus-nightly</id>
             <name>DataNucleus Nightly</name>
-            <url>file:/home/jpox/htdocs/downloads/maven2-nightly/</url>
+            <url>file:~/htdocs/downloads/maven2-nightly/</url>
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
         <repository>

Modified: platform/store.types.google.collections/trunk/pom.xml
===================================================================
--- platform/store.types.google.collections/trunk/pom.xml	2013-05-07 09:56:14 UTC (rev 16986)
+++ platform/store.types.google.collections/trunk/pom.xml	2013-05-07 10:37:09 UTC (rev 16987)
@@ -55,7 +55,7 @@
         <snapshotRepository>
             <id>datanucleus-nightly</id>
             <name>DataNucleus Nightly</name>
-            <url>file:/home/jpox/htdocs/downloads/maven2-nightly/</url>
+            <url>file:~/htdocs/downloads/maven2-nightly/</url>
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
         <!--repository>

Modified: platform/store.types.jodatime/trunk/pom.xml
===================================================================
--- platform/store.types.jodatime/trunk/pom.xml	2013-05-07 09:56:14 UTC (rev 16986)
+++ platform/store.types.jodatime/trunk/pom.xml	2013-05-07 10:37:09 UTC (rev 16987)
@@ -55,7 +55,7 @@
         <snapshotRepository>
             <id>datanucleus-nightly</id>
             <name>DataNucleus Nightly</name>
-            <url>file:/home/jpox/htdocs/downloads/maven2-nightly/</url>
+            <url>file:~/htdocs/downloads/maven2-nightly/</url>
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
         <!--repository>

Modified: platform/store.types.spatial/trunk/pom.xml
===================================================================
--- platform/store.types.spatial/trunk/pom.xml	2013-05-07 09:56:14 UTC (rev 16986)
+++ platform/store.types.spatial/trunk/pom.xml	2013-05-07 10:37:09 UTC (rev 16987)
@@ -53,7 +53,7 @@
         <snapshotRepository>
             <id>datanucleus-nightly</id>
             <name>DataNucleus Nightly</name>
-            <url>file:/home/jpox/htdocs/downloads/maven2-nightly/</url>
+            <url>file:~/htdocs/downloads/maven2-nightly/</url>
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
         <!--repository>

Modified: platform/store.xml/trunk/pom.xml
===================================================================
--- platform/store.xml/trunk/pom.xml	2013-05-07 09:56:14 UTC (rev 16986)
+++ platform/store.xml/trunk/pom.xml	2013-05-07 10:37:09 UTC (rev 16987)
@@ -55,7 +55,7 @@
         <snapshotRepository>
             <id>datanucleus-nightly</id>
             <name>DataNucleus Nightly</name>
-            <url>file:/home/jpox/htdocs/downloads/maven2-nightly/</url>
+            <url>file:~/htdocs/downloads/maven2-nightly/</url>
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
         <!--repository>

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

[DataNucleus-commits] SF.net SVN: datanucleus:[16992] platform

From: <andy_jefferson@us...> - 2013-05-09 09:29

Revision: 16992
          http://sourceforge.net/p/datanucleus/code/16992
Author:   andy_jefferson
Date:     2013-05-09 09:29:24 +0000 (Thu, 09 May 2013)
Log Message:
-----------
further attempt to get Maven to work with Nightlabs and Codewizards.co nightly build locations

Modified Paths:
--------------
    platform/api.jdo/trunk/pom.xml
    platform/api.jpa/trunk/pom.xml
    platform/api.rest/trunk/pom.xml
    platform/cache/trunk/pom.xml
    platform/core/trunk/pom.xml
    platform/jdo.connector/trunk/pom.xml
    platform/jdo.query/trunk/pom.xml
    platform/jpa.query/trunk/pom.xml
    platform/store.excel/trunk/pom.xml
    platform/store.hbase/trunk/pom.xml
    platform/store.json/trunk/pom.xml
    platform/store.ldap/trunk/pom.xml
    platform/store.mongodb/trunk/pom.xml
    platform/store.neo4j/trunk/pom.xml
    platform/store.neodatis/trunk/pom.xml
    platform/store.odf/trunk/pom.xml
    platform/store.rdbms/trunk/pom.xml
    platform/store.types.awtgeom/trunk/pom.xml
    platform/store.types.google.collections/trunk/pom.xml
    platform/store.types.jodatime/trunk/pom.xml
    platform/store.types.spatial/trunk/pom.xml
    platform/store.xml/trunk/pom.xml

Modified: platform/api.jdo/trunk/pom.xml
===================================================================
--- platform/api.jdo/trunk/pom.xml	2013-05-08 18:49:25 UTC (rev 16991)
+++ platform/api.jdo/trunk/pom.xml	2013-05-09 09:29:24 UTC (rev 16992)
@@ -55,7 +55,7 @@
         <snapshotRepository>
             <id>datanucleus-nightly</id>
             <name>DataNucleus Nightly</name>
-            <url>file:~/htdocs/downloads/maven2-nightly/</url>
+            <url>file:${user.home}/htdocs/downloads/maven2-nightly/</url>
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
         <!--repository>

Modified: platform/api.jpa/trunk/pom.xml
===================================================================
--- platform/api.jpa/trunk/pom.xml	2013-05-08 18:49:25 UTC (rev 16991)
+++ platform/api.jpa/trunk/pom.xml	2013-05-09 09:29:24 UTC (rev 16992)
@@ -55,7 +55,7 @@
         <snapshotRepository>
             <id>datanucleus-nightly</id>
             <name>DataNucleus Nightly</name>
-            <url>file:~/htdocs/downloads/maven2-nightly/</url>
+            <url>file:${user.home}/htdocs/downloads/maven2-nightly/</url>
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
         <!--repository>

Modified: platform/api.rest/trunk/pom.xml
===================================================================
--- platform/api.rest/trunk/pom.xml	2013-05-08 18:49:25 UTC (rev 16991)
+++ platform/api.rest/trunk/pom.xml	2013-05-09 09:29:24 UTC (rev 16992)
@@ -56,7 +56,7 @@
         <snapshotRepository>
             <id>datanucleus-nightly</id>
             <name>DataNucleus Nightly</name>
-            <url>file:~/htdocs/downloads/maven2-nightly/</url>
+            <url>file:${user.home}/htdocs/downloads/maven2-nightly/</url>
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
         <!--repository>

Modified: platform/cache/trunk/pom.xml
===================================================================
--- platform/cache/trunk/pom.xml	2013-05-08 18:49:25 UTC (rev 16991)
+++ platform/cache/trunk/pom.xml	2013-05-09 09:29:24 UTC (rev 16992)
@@ -45,7 +45,7 @@
         <snapshotRepository>
             <id>datanucleus-nightly</id>
             <name>DataNucleus Nightly</name>
-            <url>file:~/htdocs/downloads/maven2-nightly/</url>
+            <url>file:${user.home}/htdocs/downloads/maven2-nightly/</url>
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
         <repository>

Modified: platform/core/trunk/pom.xml
===================================================================
--- platform/core/trunk/pom.xml	2013-05-08 18:49:25 UTC (rev 16991)
+++ platform/core/trunk/pom.xml	2013-05-09 09:29:24 UTC (rev 16992)
@@ -56,7 +56,7 @@
         <snapshotRepository>
             <id>datanucleus-nightly</id>
             <name>DataNucleus Nightly</name>
-            <url>file:~/htdocs/downloads/maven2-nightly/</url>
+            <url>file:${user.home}/htdocs/downloads/maven2-nightly/</url>
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
         <!--repository>

Modified: platform/jdo.connector/trunk/pom.xml
===================================================================
--- platform/jdo.connector/trunk/pom.xml	2013-05-08 18:49:25 UTC (rev 16991)
+++ platform/jdo.connector/trunk/pom.xml	2013-05-09 09:29:24 UTC (rev 16992)
@@ -48,7 +48,7 @@
         <snapshotRepository>
             <id>datanucleus-nightly</id>
             <name>DataNucleus Nightly</name>
-            <url>file:~/htdocs/downloads/maven2-nightly/</url>
+            <url>file:${user.home}/htdocs/downloads/maven2-nightly/</url>
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
         <repository>

Modified: platform/jdo.query/trunk/pom.xml
===================================================================
--- platform/jdo.query/trunk/pom.xml	2013-05-08 18:49:25 UTC (rev 16991)
+++ platform/jdo.query/trunk/pom.xml	2013-05-09 09:29:24 UTC (rev 16992)
@@ -46,7 +46,7 @@
         <snapshotRepository>
             <id>datanucleus-nightly</id>
             <name>DataNucleus Nightly</name>
-            <url>file:~/htdocs/downloads/maven2-nightly/</url>
+            <url>file:${user.home}/htdocs/downloads/maven2-nightly/</url>
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
         <repository>

Modified: platform/jpa.query/trunk/pom.xml
===================================================================
--- platform/jpa.query/trunk/pom.xml	2013-05-08 18:49:25 UTC (rev 16991)
+++ platform/jpa.query/trunk/pom.xml	2013-05-09 09:29:24 UTC (rev 16992)
@@ -46,7 +46,7 @@
         <snapshotRepository>
             <id>datanucleus-nightly</id>
             <name>DataNucleus Nightly</name>
-            <url>file:~/htdocs/downloads/maven2-nightly/</url>
+            <url>file:${user.home}/htdocs/downloads/maven2-nightly/</url>
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
         <repository>

Modified: platform/store.excel/trunk/pom.xml
===================================================================
--- platform/store.excel/trunk/pom.xml	2013-05-08 18:49:25 UTC (rev 16991)
+++ platform/store.excel/trunk/pom.xml	2013-05-09 09:29:24 UTC (rev 16992)
@@ -55,7 +55,7 @@
         <snapshotRepository>
             <id>datanucleus-nightly</id>
             <name>DataNucleus Nightly</name>
-            <url>file:~/htdocs/downloads/maven2-nightly/</url>
+            <url>file:${user.home}/htdocs/downloads/maven2-nightly/</url>
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
         <!--repository>

Modified: platform/store.hbase/trunk/pom.xml
===================================================================
--- platform/store.hbase/trunk/pom.xml	2013-05-08 18:49:25 UTC (rev 16991)
+++ platform/store.hbase/trunk/pom.xml	2013-05-09 09:29:24 UTC (rev 16992)
@@ -55,7 +55,7 @@
         <snapshotRepository>
             <id>datanucleus-nightly</id>
             <name>DataNucleus Nightly</name>
-            <url>file:~/htdocs/downloads/maven2-nightly/</url>
+            <url>file:${user.home}/htdocs/downloads/maven2-nightly/</url>
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
         <!--repository>

Modified: platform/store.json/trunk/pom.xml
===================================================================
--- platform/store.json/trunk/pom.xml	2013-05-08 18:49:25 UTC (rev 16991)
+++ platform/store.json/trunk/pom.xml	2013-05-09 09:29:24 UTC (rev 16992)
@@ -55,7 +55,7 @@
         <snapshotRepository>
             <id>datanucleus-nightly</id>
             <name>DataNucleus Nightly</name>
-            <url>file:~/htdocs/downloads/maven2-nightly/</url>
+            <url>file:${user.home}/htdocs/downloads/maven2-nightly/</url>
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
         <!--repository>

Modified: platform/store.ldap/trunk/pom.xml
===================================================================
--- platform/store.ldap/trunk/pom.xml	2013-05-08 18:49:25 UTC (rev 16991)
+++ platform/store.ldap/trunk/pom.xml	2013-05-09 09:29:24 UTC (rev 16992)
@@ -55,7 +55,7 @@
         <snapshotRepository>
             <id>datanucleus-nightly</id>
             <name>DataNucleus Nightly</name>
-            <url>file:~/htdocs/downloads/maven2-nightly/</url>
+            <url>file:${user.home}/htdocs/downloads/maven2-nightly/</url>
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
         <!--repository>

Modified: platform/store.mongodb/trunk/pom.xml
===================================================================
--- platform/store.mongodb/trunk/pom.xml	2013-05-08 18:49:25 UTC (rev 16991)
+++ platform/store.mongodb/trunk/pom.xml	2013-05-09 09:29:24 UTC (rev 16992)
@@ -55,7 +55,7 @@
         <snapshotRepository>
             <id>datanucleus-nightly</id>
             <name>DataNucleus Nightly</name>
-            <url>file:~/htdocs/downloads/maven2-nightly/</url>
+            <url>file:${user.home}/htdocs/downloads/maven2-nightly/</url>
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
         <!--repository>

Modified: platform/store.neo4j/trunk/pom.xml
===================================================================
--- platform/store.neo4j/trunk/pom.xml	2013-05-08 18:49:25 UTC (rev 16991)
+++ platform/store.neo4j/trunk/pom.xml	2013-05-09 09:29:24 UTC (rev 16992)
@@ -55,7 +55,7 @@
         <snapshotRepository>
             <id>datanucleus-nightly</id>
             <name>DataNucleus Nightly</name>
-            <url>file:~/htdocs/downloads/maven2-nightly/</url>
+            <url>file:${user.home}/htdocs/downloads/maven2-nightly/</url>
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
         <!--repository>

Modified: platform/store.neodatis/trunk/pom.xml
===================================================================
--- platform/store.neodatis/trunk/pom.xml	2013-05-08 18:49:25 UTC (rev 16991)
+++ platform/store.neodatis/trunk/pom.xml	2013-05-09 09:29:24 UTC (rev 16992)
@@ -55,7 +55,7 @@
         <snapshotRepository>
             <id>datanucleus-nightly</id>
             <name>DataNucleus Nightly</name>
-            <url>file:~/htdocs/downloads/maven2-nightly/</url>
+            <url>file:${user.home}/htdocs/downloads/maven2-nightly/</url>
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
         <!--repository>

Modified: platform/store.odf/trunk/pom.xml
===================================================================
--- platform/store.odf/trunk/pom.xml	2013-05-08 18:49:25 UTC (rev 16991)
+++ platform/store.odf/trunk/pom.xml	2013-05-09 09:29:24 UTC (rev 16992)
@@ -55,7 +55,7 @@
         <snapshotRepository>
             <id>datanucleus-nightly</id>
             <name>DataNucleus Nightly</name>
-            <url>file:~/htdocs/downloads/maven2-nightly/</url>
+            <url>file:${user.home}/htdocs/downloads/maven2-nightly/</url>
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
         <!--repository>

Modified: platform/store.rdbms/trunk/pom.xml
===================================================================
--- platform/store.rdbms/trunk/pom.xml	2013-05-08 18:49:25 UTC (rev 16991)
+++ platform/store.rdbms/trunk/pom.xml	2013-05-09 09:29:24 UTC (rev 16992)
@@ -55,7 +55,7 @@
         <snapshotRepository>
             <id>datanucleus-nightly</id>
             <name>DataNucleus Nightly</name>
-            <url>file:~/htdocs/downloads/maven2-nightly/</url>
+            <url>file:${user.home}/htdocs/downloads/maven2-nightly/</url>
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
         <!--repository>

Modified: platform/store.types.awtgeom/trunk/pom.xml
===================================================================
--- platform/store.types.awtgeom/trunk/pom.xml	2013-05-08 18:49:25 UTC (rev 16991)
+++ platform/store.types.awtgeom/trunk/pom.xml	2013-05-09 09:29:24 UTC (rev 16992)
@@ -51,7 +51,7 @@
         <snapshotRepository>
             <id>datanucleus-nightly</id>
             <name>DataNucleus Nightly</name>
-            <url>file:~/htdocs/downloads/maven2-nightly/</url>
+            <url>file:${user.home}/htdocs/downloads/maven2-nightly/</url>
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
         <repository>

Modified: platform/store.types.google.collections/trunk/pom.xml
===================================================================
--- platform/store.types.google.collections/trunk/pom.xml	2013-05-08 18:49:25 UTC (rev 16991)
+++ platform/store.types.google.collections/trunk/pom.xml	2013-05-09 09:29:24 UTC (rev 16992)
@@ -55,7 +55,7 @@
         <snapshotRepository>
             <id>datanucleus-nightly</id>
             <name>DataNucleus Nightly</name>
-            <url>file:~/htdocs/downloads/maven2-nightly/</url>
+            <url>file:${user.home}/htdocs/downloads/maven2-nightly/</url>
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
         <!--repository>

Modified: platform/store.types.jodatime/trunk/pom.xml
===================================================================
--- platform/store.types.jodatime/trunk/pom.xml	2013-05-08 18:49:25 UTC (rev 16991)
+++ platform/store.types.jodatime/trunk/pom.xml	2013-05-09 09:29:24 UTC (rev 16992)
@@ -55,7 +55,7 @@
         <snapshotRepository>
             <id>datanucleus-nightly</id>
             <name>DataNucleus Nightly</name>
-            <url>file:~/htdocs/downloads/maven2-nightly/</url>
+            <url>file:${user.home}/htdocs/downloads/maven2-nightly/</url>
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
         <!--repository>

Modified: platform/store.types.spatial/trunk/pom.xml
===================================================================
--- platform/store.types.spatial/trunk/pom.xml	2013-05-08 18:49:25 UTC (rev 16991)
+++ platform/store.types.spatial/trunk/pom.xml	2013-05-09 09:29:24 UTC (rev 16992)
@@ -53,7 +53,7 @@
         <snapshotRepository>
             <id>datanucleus-nightly</id>
             <name>DataNucleus Nightly</name>
-            <url>file:~/htdocs/downloads/maven2-nightly/</url>
+            <url>file:${user.home}/htdocs/downloads/maven2-nightly/</url>
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
         <!--repository>

Modified: platform/store.xml/trunk/pom.xml
===================================================================
--- platform/store.xml/trunk/pom.xml	2013-05-08 18:49:25 UTC (rev 16991)
+++ platform/store.xml/trunk/pom.xml	2013-05-09 09:29:24 UTC (rev 16992)
@@ -55,7 +55,7 @@
         <snapshotRepository>
             <id>datanucleus-nightly</id>
             <name>DataNucleus Nightly</name>
-            <url>file:~/htdocs/downloads/maven2-nightly/</url>
+            <url>file:${user.home}/htdocs/downloads/maven2-nightly/</url>
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
         <!--repository>

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

[DataNucleus-commits] SF.net SVN: datanucleus:[17006] platform

From: <andy_jefferson@us...> - 2013-05-14 11:21

Revision: 17006
          http://sourceforge.net/p/datanucleus/code/17006
Author:   andy_jefferson
Date:     2013-05-14 11:21:41 +0000 (Tue, 14 May 2013)
Log Message:
-----------
update SCM info to match what seems to work with Maven and Sonatype

Modified Paths:
--------------
    platform/api.jdo/trunk/pom.xml
    platform/api.jpa/trunk/pom.xml
    platform/api.rest/trunk/pom.xml
    platform/cache/trunk/pom.xml
    platform/jdo.connector/trunk/pom.xml
    platform/jdo.query/trunk/pom.xml
    platform/jpa.query/trunk/pom.xml
    platform/store.excel/trunk/pom.xml
    platform/store.hbase/trunk/pom.xml
    platform/store.json/trunk/pom.xml
    platform/store.ldap/trunk/pom.xml
    platform/store.mongodb/trunk/pom.xml
    platform/store.neo4j/trunk/pom.xml
    platform/store.neodatis/trunk/pom.xml
    platform/store.odf/trunk/pom.xml
    platform/store.rdbms/trunk/pom.xml
    platform/store.types.awtgeom/trunk/pom.xml
    platform/store.types.google.collections/trunk/pom.xml
    platform/store.types.jodatime/trunk/pom.xml
    platform/store.types.spatial/trunk/pom.xml
    platform/store.xml/trunk/pom.xml

Modified: platform/api.jdo/trunk/pom.xml
===================================================================
--- platform/api.jdo/trunk/pom.xml	2013-05-14 11:04:14 UTC (rev 17005)
+++ platform/api.jdo/trunk/pom.xml	2013-05-14 11:21:41 UTC (rev 17006)
@@ -30,8 +30,9 @@
     </licenses>
 
     <scm>
-        <url>https://sourceforge.net/p/datanucleus/code/HEAD/tree/platform/api.jdo/trunk/</url>
-        <connection>scm:svn:https://svn.code.sf.net/p/datanucleus/code/platform/api.jdo/trunk</connection>
+        <connection>scm:svn:svn://andy_jefferson@...>>
+        <developerConnection>scm:svn:svn+ssh://andy_jefferson@...>>
+        <url>http://svn.code.sf.net/p/datanucleus/code/platform/api.jdo/trunk</url>
     </scm>
 
     <developers>

Modified: platform/api.jpa/trunk/pom.xml
===================================================================
--- platform/api.jpa/trunk/pom.xml	2013-05-14 11:04:14 UTC (rev 17005)
+++ platform/api.jpa/trunk/pom.xml	2013-05-14 11:21:41 UTC (rev 17006)
@@ -30,8 +30,9 @@
     </licenses>
 
     <scm>
-        <url>https://sourceforge.net/p/datanucleus/code/HEAD/tree/platform/api.jpa/trunk/</url>
-        <connection>scm:svn:https://svn.code.sf.net/p/datanucleus/code/platform/api.jpa/trunk</connection>
+        <connection>scm:svn:svn://andy_jefferson@...>>
+        <developerConnection>scm:svn:svn+ssh://andy_jefferson@...>>
+        <url>http://svn.code.sf.net/p/datanucleus/code/platform/api.jpa/trunk</url>
     </scm>
 
     <developers>

Modified: platform/api.rest/trunk/pom.xml
===================================================================
--- platform/api.rest/trunk/pom.xml	2013-05-14 11:04:14 UTC (rev 17005)
+++ platform/api.rest/trunk/pom.xml	2013-05-14 11:21:41 UTC (rev 17006)
@@ -30,8 +30,9 @@
     </licenses>
 
     <scm>
-        <url>https://sourceforge.net/p/datanucleus/code/HEAD/tree/platform/api.rest/trunk/</url>
-        <connection>scm:svn:https://svn.code.sf.net/p/datanucleus/code/platform/api.rest/trunk</connection>
+        <connection>scm:svn:svn://andy_jefferson@...>>
+        <developerConnection>scm:svn:svn+ssh://andy_jefferson@...>>
+        <url>http://svn.code.sf.net/p/datanucleus/code/platform/api.rest/trunk</url>
     </scm>
 
     <developers>

Modified: platform/cache/trunk/pom.xml
===================================================================
--- platform/cache/trunk/pom.xml	2013-05-14 11:04:14 UTC (rev 17005)
+++ platform/cache/trunk/pom.xml	2013-05-14 11:21:41 UTC (rev 17006)
@@ -19,8 +19,9 @@
     </licenses>
 
     <scm>
-        <url>https://sourceforge.net/p/datanucleus/code/HEAD/tree/platform/cache/trunk/</url>
-        <connection>scm:svn:https://svn.code.sf.net/p/datanucleus/code/platform/cache/trunk</connection>
+        <connection>scm:svn:svn://andy_jefferson@...>>
+        <developerConnection>scm:svn:svn+ssh://andy_jefferson@...>>
+        <url>http://svn.code.sf.net/p/datanucleus/code/platform/cache/trunk</url>
     </scm>
 
     <developers>

Modified: platform/jdo.connector/trunk/pom.xml
===================================================================
--- platform/jdo.connector/trunk/pom.xml	2013-05-14 11:04:14 UTC (rev 17005)
+++ platform/jdo.connector/trunk/pom.xml	2013-05-14 11:21:41 UTC (rev 17006)
@@ -22,8 +22,9 @@
     </licenses>
 
     <scm>
-        <url>http://datanucleus.svn.sourceforge.net/viewvc/datanucleus/platform/jdo.connector/trunk/</url>
-        <connection>scm:svn:https://datanucleus.svn.sourceforge.net/svnroot/datanucleus/platform/jdo.connector/trunk</connection>
+        <connection>scm:svn:svn://andy_jefferson@...>>
+        <developerConnection>scm:svn:svn+ssh://andy_jefferson@...>>
+        <url>http://svn.code.sf.net/p/datanucleus/code/platform/jdo.connector/trunk</url>
     </scm>
 
     <developers>

Modified: platform/jdo.query/trunk/pom.xml
===================================================================
--- platform/jdo.query/trunk/pom.xml	2013-05-14 11:04:14 UTC (rev 17005)
+++ platform/jdo.query/trunk/pom.xml	2013-05-14 11:21:41 UTC (rev 17006)
@@ -20,8 +20,9 @@
     </licenses>
 
     <scm>
-        <url>http://datanucleus.svn.sourceforge.net/viewvc/datanucleus/platform/jdo.query/trunk/</url>
-        <connection>scm:svn:https://datanucleus.svn.sourceforge.net/svnroot/datanucleus/platform/jdo.query/trunk</connection>
+        <connection>scm:svn:svn://andy_jefferson@...>>
+        <developerConnection>scm:svn:svn+ssh://andy_jefferson@...>>
+        <url>http://svn.code.sf.net/p/datanucleus/code/platform/jdo.query/trunk</url>
     </scm>
 
     <developers>

Modified: platform/jpa.query/trunk/pom.xml
===================================================================
--- platform/jpa.query/trunk/pom.xml	2013-05-14 11:04:14 UTC (rev 17005)
+++ platform/jpa.query/trunk/pom.xml	2013-05-14 11:21:41 UTC (rev 17006)
@@ -20,8 +20,9 @@
     </licenses>
 
     <scm>
-        <url>http://datanucleus.svn.sourceforge.net/viewvc/datanucleus/platform/jpa.query/trunk/</url>
-        <connection>scm:svn:https://datanucleus.svn.sourceforge.net/svnroot/datanucleus/platform/jpa.query/trunk</connection>
+        <connection>scm:svn:svn://andy_jefferson@...>>
+        <developerConnection>scm:svn:svn+ssh://andy_jefferson@...>>
+        <url>http://svn.code.sf.net/p/datanucleus/code/platform/jpa.query/trunk</url>
     </scm>
 
     <developers>

Modified: platform/store.excel/trunk/pom.xml
===================================================================
--- platform/store.excel/trunk/pom.xml	2013-05-14 11:04:14 UTC (rev 17005)
+++ platform/store.excel/trunk/pom.xml	2013-05-14 11:21:41 UTC (rev 17006)
@@ -29,8 +29,9 @@
     </licenses>
 
     <scm>
-        <url>https://sourceforge.net/p/datanucleus/code/HEAD/tree/platform/store.excel/trunk/</url>
-        <connection>scm:svn:https://svn.code.sf.net/p/datanucleus/code/platform/store.excel/trunk</connection>
+        <connection>scm:svn:svn://andy_jefferson@...>>
+        <developerConnection>scm:svn:svn+ssh://andy_jefferson@...>>
+        <url>http://svn.code.sf.net/p/datanucleus/code/platform/store.excel/trunk</url>
     </scm>
 
     <developers>

Modified: platform/store.hbase/trunk/pom.xml
===================================================================
--- platform/store.hbase/trunk/pom.xml	2013-05-14 11:04:14 UTC (rev 17005)
+++ platform/store.hbase/trunk/pom.xml	2013-05-14 11:21:41 UTC (rev 17006)
@@ -29,8 +29,9 @@
     </licenses>
 
     <scm>
-        <url>https://sourceforge.net/p/datanucleus/code/HEAD/tree/platform/store.hbase/trunk/</url>
-        <connection>scm:svn:https://svn.code.sf.net/p/datanucleus/code/platform/store.hbase/trunk</connection>
+        <connection>scm:svn:svn://andy_jefferson@...>>
+        <developerConnection>scm:svn:svn+ssh://andy_jefferson@...>>
+        <url>http://svn.code.sf.net/p/datanucleus/code/platform/store.hbase/trunk</url>
     </scm>
 
     <developers>

Modified: platform/store.json/trunk/pom.xml
===================================================================
--- platform/store.json/trunk/pom.xml	2013-05-14 11:04:14 UTC (rev 17005)
+++ platform/store.json/trunk/pom.xml	2013-05-14 11:21:41 UTC (rev 17006)
@@ -30,8 +30,9 @@
     </licenses>
 
     <scm>
-        <url>https://sourceforge.net/p/datanucleus/code/HEAD/tree/platform/store.json/trunk/</url>
-        <connection>scm:svn:https://svn.code.sf.net/p/datanucleus/code/platform/store.json/trunk</connection>
+        <connection>scm:svn:svn://andy_jefferson@...>>
+        <developerConnection>scm:svn:svn+ssh://andy_jefferson@...>>
+        <url>http://svn.code.sf.net/p/datanucleus/code/platform/store.json/trunk</url>
     </scm>
 
     <developers>

Modified: platform/store.ldap/trunk/pom.xml
===================================================================
--- platform/store.ldap/trunk/pom.xml	2013-05-14 11:04:14 UTC (rev 17005)
+++ platform/store.ldap/trunk/pom.xml	2013-05-14 11:21:41 UTC (rev 17006)
@@ -29,8 +29,9 @@
     </licenses>
 
     <scm>
-        <url>https://sourceforge.net/p/datanucleus/code/HEAD/tree/platform/store.ldap/trunk/</url>
-        <connection>scm:svn:https://svn.code.sf.net/p/datanucleus/code/platform/store.ldap/trunk</connection>
+        <connection>scm:svn:svn://andy_jefferson@...>>
+        <developerConnection>scm:svn:svn+ssh://andy_jefferson@...>>
+        <url>http://svn.code.sf.net/p/datanucleus/code/platform/store.ldap/trunk</url>
     </scm>
 
     <developers>

Modified: platform/store.mongodb/trunk/pom.xml
===================================================================
--- platform/store.mongodb/trunk/pom.xml	2013-05-14 11:04:14 UTC (rev 17005)
+++ platform/store.mongodb/trunk/pom.xml	2013-05-14 11:21:41 UTC (rev 17006)
@@ -29,8 +29,9 @@
     </licenses>
 
     <scm>
-        <url>https://sourceforge.net/p/datanucleus/code/HEAD/tree/platform/store.mongodb/trunk/</url>
-        <connection>scm:svn:https://svn.code.sf.net/p/datanucleus/code/platform/store.mongodb/trunk</connection>
+        <connection>scm:svn:svn://andy_jefferson@...>>
+        <developerConnection>scm:svn:svn+ssh://andy_jefferson@...>>
+        <url>http://svn.code.sf.net/p/datanucleus/code/platform/store.mongodb/trunk</url>
     </scm>
 
     <developers>

Modified: platform/store.neo4j/trunk/pom.xml
===================================================================
--- platform/store.neo4j/trunk/pom.xml	2013-05-14 11:04:14 UTC (rev 17005)
+++ platform/store.neo4j/trunk/pom.xml	2013-05-14 11:21:41 UTC (rev 17006)
@@ -29,8 +29,9 @@
     </licenses>
 
     <scm>
-        <url>https://sourceforge.net/p/datanucleus/code/HEAD/tree/platform/store.neo4j/trunk/</url>
-        <connection>scm:svn:https://svn.code.sf.net/p/datanucleus/code/platform/store.neo4j/trunk</connection>
+        <connection>scm:svn:svn://andy_jefferson@...>>
+        <developerConnection>scm:svn:svn+ssh://andy_jefferson@...>>
+        <url>http://svn.code.sf.net/p/datanucleus/code/platform/store.neo4j/trunk</url>
     </scm>
 
     <developers>

Modified: platform/store.neodatis/trunk/pom.xml
===================================================================
--- platform/store.neodatis/trunk/pom.xml	2013-05-14 11:04:14 UTC (rev 17005)
+++ platform/store.neodatis/trunk/pom.xml	2013-05-14 11:21:41 UTC (rev 17006)
@@ -29,8 +29,9 @@
     </licenses>
 
     <scm>
-        <url>https://sourceforge.net/p/datanucleus/code/HEAD/tree/platform/store.neodatis/trunk/</url>
-        <connection>scm:svn:https://svn.code.sf.net/p/datanucleus/code/platform/store.neodatis/trunk</connection>
+        <connection>scm:svn:svn://andy_jefferson@...>>
+        <developerConnection>scm:svn:svn+ssh://andy_jefferson@...>>
+        <url>http://svn.code.sf.net/p/datanucleus/code/platform/store.neodatis/trunk</url>
     </scm>
 
     <developers>

Modified: platform/store.odf/trunk/pom.xml
===================================================================
--- platform/store.odf/trunk/pom.xml	2013-05-14 11:04:14 UTC (rev 17005)
+++ platform/store.odf/trunk/pom.xml	2013-05-14 11:21:41 UTC (rev 17006)
@@ -29,8 +29,9 @@
     </licenses>
 
     <scm>
-        <url>https://sourceforge.net/p/datanucleus/code/HEAD/tree/platform/store.odf/trunk/</url>
-        <connection>scm:svn:https://svn.code.sf.net/p/datanucleus/code/platform/store.odf/trunk</connection>
+        <connection>scm:svn:svn://andy_jefferson@...>>
+        <developerConnection>scm:svn:svn+ssh://andy_jefferson@...>>
+        <url>http://svn.code.sf.net/p/datanucleus/code/platform/store.odf/trunk</url>
     </scm>
 
     <developers>

Modified: platform/store.rdbms/trunk/pom.xml
===================================================================
--- platform/store.rdbms/trunk/pom.xml	2013-05-14 11:04:14 UTC (rev 17005)
+++ platform/store.rdbms/trunk/pom.xml	2013-05-14 11:21:41 UTC (rev 17006)
@@ -29,8 +29,9 @@
     </licenses>
 
     <scm>
-        <url>https://sourceforge.net/p/datanucleus/code/HEAD/tree/platform/store.rdbms/trunk/</url>
-        <connection>scm:svn:https://svn.code.sf.net/p/datanucleus/code/platform/store.rdbms/trunk</connection>
+        <connection>scm:svn:svn://andy_jefferson@...>>
+        <developerConnection>scm:svn:svn+ssh://andy_jefferson@...>>
+        <url>http://svn.code.sf.net/p/datanucleus/code/platform/store.rdbms/trunk</url>
     </scm>
 
     <developers>

Modified: platform/store.types.awtgeom/trunk/pom.xml
===================================================================
--- platform/store.types.awtgeom/trunk/pom.xml	2013-05-14 11:04:14 UTC (rev 17005)
+++ platform/store.types.awtgeom/trunk/pom.xml	2013-05-14 11:21:41 UTC (rev 17006)
@@ -25,8 +25,9 @@
     </licenses>
 
     <scm>
-        <url>https://sourceforge.net/p/datanucleus/code/HEAD/tree/platform/store.types.awtgeom/trunk/</url>
-        <connection>scm:svn:https://svn.code.sf.net/p/datanucleus/code/platform/store.types.awtgeom/trunk</connection>
+        <connection>scm:svn:svn://andy_jefferson@...>>
+        <developerConnection>scm:svn:svn+ssh://andy_jefferson@...>>
+        <url>http://svn.code.sf.net/p/datanucleus/code/platform/store.types.awtgeom/trunk</url>
     </scm>
 
     <developers>

Modified: platform/store.types.google.collections/trunk/pom.xml
===================================================================
--- platform/store.types.google.collections/trunk/pom.xml	2013-05-14 11:04:14 UTC (rev 17005)
+++ platform/store.types.google.collections/trunk/pom.xml	2013-05-14 11:21:41 UTC (rev 17006)
@@ -29,8 +29,9 @@
     </licenses>
 
     <scm>
-        <url>https://sourceforge.net/p/datanucleus/code/HEAD/tree/platform/store.types.google.collections/trunk/</url>
-        <connection>scm:svn:https://svn.code.sf.net/p/datanucleus/code/platform/store.types.google.collections/trunk</connection>
+        <connection>scm:svn:svn://andy_jefferson@...>>
+        <developerConnection>scm:svn:svn+ssh://andy_jefferson@...>>
+        <url>http://svn.code.sf.net/p/datanucleus/code/platform/store.types.google.collections/trunk</url>
     </scm>
 
     <developers>

Modified: platform/store.types.jodatime/trunk/pom.xml
===================================================================
--- platform/store.types.jodatime/trunk/pom.xml	2013-05-14 11:04:14 UTC (rev 17005)
+++ platform/store.types.jodatime/trunk/pom.xml	2013-05-14 11:21:41 UTC (rev 17006)
@@ -29,8 +29,9 @@
     </licenses>
 
     <scm>
-        <url>https://sourceforge.net/p/datanucleus/code/HEAD/tree/platform/store.types.jodatime/trunk/</url>
-        <connection>scm:svn:https://svn.code.sf.net/p/datanucleus/code/platform/store.types.jodatime/trunk</connection>
+        <connection>scm:svn:svn://andy_jefferson@...>>
+        <developerConnection>scm:svn:svn+ssh://andy_jefferson@...>>
+        <url>http://svn.code.sf.net/p/datanucleus/code/platform/store.types.jodatime/trunk</url>
     </scm>
 
     <developers>

Modified: platform/store.types.spatial/trunk/pom.xml
===================================================================
--- platform/store.types.spatial/trunk/pom.xml	2013-05-14 11:04:14 UTC (rev 17005)
+++ platform/store.types.spatial/trunk/pom.xml	2013-05-14 11:21:41 UTC (rev 17006)
@@ -27,8 +27,9 @@
     </licenses>
 
     <scm>
-        <url>https://sourceforge.net/p/datanucleus/code/HEAD/tree/platform/store.types.spatial/trunk/</url>
-        <connection>scm:svn:https://svn.code.sf.net/p/datanucleus/code/platform/store.types.spatial/trunk</connection>
+        <connection>scm:svn:svn://andy_jefferson@...>>
+        <developerConnection>scm:svn:svn+ssh://andy_jefferson@...>>
+        <url>http://svn.code.sf.net/p/datanucleus/code/platform/store.types.spatial/trunk</url>
     </scm>
 
     <developers>

Modified: platform/store.xml/trunk/pom.xml
===================================================================
--- platform/store.xml/trunk/pom.xml	2013-05-14 11:04:14 UTC (rev 17005)
+++ platform/store.xml/trunk/pom.xml	2013-05-14 11:21:41 UTC (rev 17006)
@@ -29,8 +29,9 @@
     </licenses>
 
     <scm>
-        <url>https://sourceforge.net/p/datanucleus/code/HEAD/tree/platform/store.xml/trunk/</url>
-        <connection>scm:svn:https://svn.code.sf.net/p/datanucleus/code/platform/store.xml/trunk</connection>
+        <connection>scm:svn:svn://andy_jefferson@...>>
+        <developerConnection>scm:svn:svn+ssh://andy_jefferson@...>>
+        <url>http://svn.code.sf.net/p/datanucleus/code/platform/store.xml/trunk</url>
     </scm>
 
     <developers>

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

[DataNucleus-commits] SF.net SVN: datanucleus:[17083] platform

From: <andy_jefferson@us...> - 2013-05-14 18:05

Revision: 17083
          http://sourceforge.net/p/datanucleus/code/17083
Author:   andy_jefferson
Date:     2013-05-14 18:05:39 +0000 (Tue, 14 May 2013)
Log Message:
-----------
separate projects in standard structure so we can use sonatype

Added Paths:
-----------
    platform/accessplatform-jdo-excel/
    platform/accessplatform-jdo-excel/branches/
    platform/accessplatform-jdo-excel/tags/
    platform/accessplatform-jdo-excel/trunk/
    platform/accessplatform-jdo-excel/trunk/pom.xml
    platform/accessplatform-jdo-hbase/
    platform/accessplatform-jdo-hbase/branches/
    platform/accessplatform-jdo-hbase/tags/
    platform/accessplatform-jdo-hbase/trunk/
    platform/accessplatform-jdo-hbase/trunk/pom.xml
    platform/accessplatform-jdo-json/
    platform/accessplatform-jdo-json/branches/
    platform/accessplatform-jdo-json/tags/
    platform/accessplatform-jdo-json/trunk/
    platform/accessplatform-jdo-json/trunk/pom.xml
    platform/accessplatform-jdo-ldap/
    platform/accessplatform-jdo-ldap/branches/
    platform/accessplatform-jdo-ldap/tags/
    platform/accessplatform-jdo-ldap/trunk/
    platform/accessplatform-jdo-ldap/trunk/pom.xml
    platform/accessplatform-jdo-mongodb/
    platform/accessplatform-jdo-mongodb/branches/
    platform/accessplatform-jdo-mongodb/tags/
    platform/accessplatform-jdo-mongodb/trunk/
    platform/accessplatform-jdo-mongodb/trunk/pom.xml
    platform/accessplatform-jdo-neo4j/
    platform/accessplatform-jdo-neo4j/branches/
    platform/accessplatform-jdo-neo4j/tags/
    platform/accessplatform-jdo-neo4j/trunk/
    platform/accessplatform-jdo-neo4j/trunk/pom.xml
    platform/accessplatform-jdo-odf/
    platform/accessplatform-jdo-odf/branches/
    platform/accessplatform-jdo-odf/tags/
    platform/accessplatform-jdo-odf/trunk/
    platform/accessplatform-jdo-odf/trunk/pom.xml
    platform/accessplatform-jdo-rdbms/
    platform/accessplatform-jdo-rdbms/branches/
    platform/accessplatform-jdo-rdbms/tags/
    platform/accessplatform-jdo-rdbms/trunk/
    platform/accessplatform-jdo-rdbms/trunk/pom.xml
    platform/accessplatform-jdo-xml/
    platform/accessplatform-jdo-xml/branches/
    platform/accessplatform-jdo-xml/tags/
    platform/accessplatform-jdo-xml/trunk/
    platform/accessplatform-jdo-xml/trunk/pom.xml
    platform/accessplatform-jpa-rdbms/
    platform/accessplatform-jpa-rdbms/branches/
    platform/accessplatform-jpa-rdbms/tags/
    platform/accessplatform-jpa-rdbms/trunk/
    platform/accessplatform-jpa-rdbms/trunk/pom.xml

Added: platform/accessplatform-jdo-excel/trunk/pom.xml
===================================================================
--- platform/accessplatform-jdo-excel/trunk/pom.xml	                        (rev 0)
+++ platform/accessplatform-jdo-excel/trunk/pom.xml	2013-05-14 18:05:39 UTC (rev 17083)
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.sonatype.oss</groupId>
+        <artifactId>oss-parent</artifactId>
+        <version>7</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.datanucleus</groupId>
+    <artifactId>datanucleus-accessplatform-jdo-excel</artifactId>
+    <packaging>pom</packaging>
+    <version>3.2.2-SNAPSHOT</version>
+    <name>DataNucleus JDO Excel Library</name>
+    <description>DataNucleus AccessPlatform libraries for JDO use with Excel</description>
+    <url>http://www.datanucleus.org</url>
+
+    <licenses>
+        <license>
+            <name>The Apache Software License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+        </license>
+    </licenses>
+
+    <scm>
+        <connection>scm:svn:http://svn.code.sf.net/p/datanucleus/code/platform/accessplatform/trunk</connection>
+        <developerConnection>scm:svn:http://svn.code.sf.net/p/datanucleus/code/platform/accessplatform/trunk</developerConnection>
+        <url>scm:svn:http://svn.code.sf.net/p/datanucleus/code/platform/accessplatform/trunk</url>
+    </scm>
+
+    <developers>
+        <developer>
+            <id>andy</id>
+            <name>Andy</name>
+            <organization>DataNucleus</organization>
+        </developer>
+    </developers>
+
+    <repositories>
+        <repository>
+            <id>DN_M2_Repo</id>
+            <url>http://www.datanucleus.org/downloads/maven2/</url>
+        </repository>
+    </repositories>
+
+    <distributionManagement>
+        <snapshotRepository>
+            <id>datanucleus-nightly</id>
+            <name>DataNucleus Nightly</name>
+            <url>file:/home/jpox/htdocs/downloads/maven2-nightly/</url>
+            <uniqueVersion>false</uniqueVersion>
+        </snapshotRepository>
+    </distributionManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>javax.jdo</groupId>
+            <artifactId>jdo-api</artifactId>
+            <version>3.0.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.datanucleus</groupId>
+            <artifactId>datanucleus-core</artifactId>
+            <version>3.2.3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.datanucleus</groupId>
+            <artifactId>datanucleus-api-jdo</artifactId>
+            <version>3.2.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.datanucleus</groupId>
+            <artifactId>datanucleus-jdo-query</artifactId>
+            <version>3.0.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.datanucleus</groupId>
+            <artifactId>datanucleus-excel</artifactId>
+            <version>3.2.0-release</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <extensions> 
+            <extension> 
+                <groupId>org.apache.maven.wagon</groupId> 
+                <artifactId>wagon-ssh-external</artifactId> 
+                <version>2.2</version> 
+            </extension> 
+        </extensions> 
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-release-plugin</artifactId>
+                <version>2.4.1</version>
+                <configuration>
+                    <tagBase>http://svn.code.sf.net/p/datanucleus/code/platform/accessplatform/tags</tagBase>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>release-sign-artifacts</id>
+            <activation>
+                <property>
+                    <name>performRelease</name>
+                    <value>true</value>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <version>1.1</version>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>

Added: platform/accessplatform-jdo-hbase/trunk/pom.xml
===================================================================
--- platform/accessplatform-jdo-hbase/trunk/pom.xml	                        (rev 0)
+++ platform/accessplatform-jdo-hbase/trunk/pom.xml	2013-05-14 18:05:39 UTC (rev 17083)
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.datanucleus</groupId>
+    <artifactId>datanucleus-accessplatform-jdo-hbase</artifactId>
+    <packaging>pom</packaging>
+    <version>3.2.1</version>
+    <name>DataNucleus JDO HBase Library</name>
+    <description>DataNucleus AccessPlatform libraries for JDO use with HBase</description>
+    <url>http://www.datanucleus.org</url>
+
+    <repositories>
+        <repository>
+            <id>DN_M2_Repo</id>
+            <url>http://www.datanucleus.org/downloads/maven2/</url>
+        </repository>
+    </repositories>
+
+    <distributionManagement>
+        <snapshotRepository>
+            <id>datanucleus-nightly</id>
+            <name>DataNucleus Nightly</name>
+            <url>file:/home/jpox/htdocs/downloads/maven2-nightly/</url>
+            <uniqueVersion>false</uniqueVersion>
+        </snapshotRepository>
+        <repository>
+            <id>datanucleus</id>
+            <url>scpexe://www.datanucleus.org//home/jpox/htdocs/downloads/maven2/</url>
+        </repository>
+    </distributionManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>javax.jdo</groupId>
+            <artifactId>jdo-api</artifactId>
+            <version>3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.datanucleus</groupId>
+            <artifactId>datanucleus-core</artifactId>
+            <version>3.2.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.datanucleus</groupId>
+            <artifactId>datanucleus-api-jdo</artifactId>
+            <version>3.2.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.datanucleus</groupId>
+            <artifactId>datanucleus-jdo-query</artifactId>
+            <version>3.0.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.datanucleus</groupId>
+            <artifactId>datanucleus-hbase</artifactId>
+            <version>3.2.0-release</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <extensions> 
+            <extension> 
+                <groupId>org.apache.maven.wagon</groupId> 
+                <artifactId>wagon-ssh-external</artifactId> 
+                <version>2.2</version> 
+            </extension> 
+        </extensions> 
+    </build>
+</project>

Added: platform/accessplatform-jdo-json/trunk/pom.xml
===================================================================
--- platform/accessplatform-jdo-json/trunk/pom.xml	                        (rev 0)
+++ platform/accessplatform-jdo-json/trunk/pom.xml	2013-05-14 18:05:39 UTC (rev 17083)
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.datanucleus</groupId>
+    <artifactId>datanucleus-accessplatform-jdo-json</artifactId>
+    <packaging>pom</packaging>
+    <version>3.2.1</version>
+    <name>DataNucleus JDO JSON Library</name>
+    <description>DataNucleus AccessPlatform libraries for JDO use with JSON</description>
+    <url>http://www.datanucleus.org</url>
+
+    <repositories>
+        <repository>
+            <id>DN_M2_Repo</id>
+            <url>http://www.datanucleus.org/downloads/maven2/</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+
+    <distributionManagement>
+        <snapshotRepository>
+            <id>datanucleus-nightly</id>
+            <name>DataNucleus Nightly</name>
+            <url>file:/home/jpox/htdocs/downloads/maven2-nightly/</url>
+            <uniqueVersion>false</uniqueVersion>
+        </snapshotRepository>
+        <repository>
+            <id>datanucleus</id>
+            <url>scpexe://www.datanucleus.org//home/jpox/htdocs/downloads/maven2/</url>
+        </repository>
+    </distributionManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>javax.jdo</groupId>
+            <artifactId>jdo-api</artifactId>
+            <version>3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.datanucleus</groupId>
+            <artifactId>datanucleus-core</artifactId>
+            <version>3.2.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.datanucleus</groupId>
+            <artifactId>datanucleus-api-jdo</artifactId>
+            <version>3.2.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.datanucleus</groupId>
+            <artifactId>datanucleus-jdo-query</artifactId>
+            <version>3.0.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.datanucleus</groupId>
+            <artifactId>datanucleus-json</artifactId>
+            <version>3.2.0-release</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <extensions> 
+            <extension> 
+                <groupId>org.apache.maven.wagon</groupId> 
+                <artifactId>wagon-ssh-external</artifactId> 
+                <version>2.2</version> 
+            </extension> 
+        </extensions> 
+    </build>
+</project>

Added: platform/accessplatform-jdo-ldap/trunk/pom.xml
===================================================================
--- platform/accessplatform-jdo-ldap/trunk/pom.xml	                        (rev 0)
+++ platform/accessplatform-jdo-ldap/trunk/pom.xml	2013-05-14 18:05:39 UTC (rev 17083)
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.datanucleus</groupId>
+    <artifactId>datanucleus-accessplatform-jdo-ldap</artifactId>
+    <packaging>pom</packaging>
+    <version>3.2.1</version>
+    <name>DataNucleus JDO LDAP Library</name>
+    <description>DataNucleus AccessPlatform libraries for JDO use with LDAP</description>
+    <url>http://www.datanucleus.org</url>
+
+    <repositories>
+        <repository>
+            <id>DN_M2_Repo</id>
+            <url>http://www.datanucleus.org/downloads/maven2/</url>
+        </repository>
+    </repositories>
+
+    <distributionManagement>
+        <snapshotRepository>
+            <id>datanucleus-nightly</id>
+            <name>DataNucleus Nightly</name>
+            <url>file:/home/jpox/htdocs/downloads/maven2-nightly/</url>
+            <uniqueVersion>false</uniqueVersion>
+        </snapshotRepository>
+        <repository>
+            <id>datanucleus</id>
+            <url>scpexe://www.datanucleus.org//home/jpox/htdocs/downloads/maven2/</url>
+        </repository>
+    </distributionManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>javax.jdo</groupId>
+            <artifactId>jdo-api</artifactId>
+            <version>3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.datanucleus</groupId>
+            <artifactId>datanucleus-core</artifactId>
+            <version>3.2.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.datanucleus</groupId>
+            <artifactId>datanucleus-api-jdo</artifactId>
+            <version>3.2.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.datanucleus</groupId>
+            <artifactId>datanucleus-jdo-query</artifactId>
+            <version>3.0.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.datanucleus</groupId>
+            <artifactId>datanucleus-ldap</artifactId>
+            <version>3.2.1</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <extensions> 
+            <extension> 
+                <groupId>org.apache.maven.wagon</groupId> 
+                <artifactId>wagon-ssh-external</artifactId> 
+                <version>2.2</version> 
+            </extension> 
+        </extensions> 
+    </build>
+</project>

Added: platform/accessplatform-jdo-mongodb/trunk/pom.xml
===================================================================
--- platform/accessplatform-jdo-mongodb/trunk/pom.xml	                        (rev 0)
+++ platform/accessplatform-jdo-mongodb/trunk/pom.xml	2013-05-14 18:05:39 UTC (rev 17083)
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.datanucleus</groupId>
+    <artifactId>datanucleus-accessplatform-jdo-mongodb</artifactId>
+    <packaging>pom</packaging>
+    <version>3.2.1</version>
+    <name>DataNucleus JDO MongoDB Library</name>
+    <description>DataNucleus AccessPlatform libraries for JDO use with MongoDB</description>
+    <url>http://www.datanucleus.org</url>
+
+    <repositories>
+        <repository>
+            <id>DN_M2_Repo</id>
+            <url>http://www.datanucleus.org/downloads/maven2/</url>
+        </repository>
+    </repositories>
+
+    <distributionManagement>
+        <snapshotRepository>
+            <id>datanucleus-nightly</id>
+            <name>DataNucleus Nightly</name>
+            <url>file:/home/jpox/htdocs/downloads/maven2-nightly/</url>
+            <uniqueVersion>false</uniqueVersion>
+        </snapshotRepository>
+        <repository>
+            <id>datanucleus</id>
+            <url>scpexe://www.datanucleus.org//home/jpox/htdocs/downloads/maven2/</url>
+        </repository>
+    </distributionManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>javax.jdo</groupId>
+            <artifactId>jdo-api</artifactId>
+            <version>3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.datanucleus</groupId>
+            <artifactId>datanucleus-core</artifactId>
+            <version>3.2.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.datanucleus</groupId>
+            <artifactId>datanucleus-api-jdo</artifactId>
+            <version>3.2.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.datanucleus</groupId>
+            <artifactId>datanucleus-jdo-query</artifactId>
+            <version>3.0.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.datanucleus</groupId>
+            <artifactId>datanucleus-mongodb</artifactId>
+            <version>3.2.1</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <extensions> 
+            <extension> 
+                <groupId>org.apache.maven.wagon</groupId> 
+                <artifactId>wagon-ssh-external</artifactId> 
+                <version>2.2</version> 
+            </extension> 
+        </extensions> 
+    </build>
+</project>

Added: platform/accessplatform-jdo-neo4j/trunk/pom.xml
===================================================================
--- platform/accessplatform-jdo-neo4j/trunk/pom.xml	                        (rev 0)
+++ platform/accessplatform-jdo-neo4j/trunk/pom.xml	2013-05-14 18:05:39 UTC (rev 17083)
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.datanucleus</groupId>
+    <artifactId>datanucleus-accessplatform-jdo-neo4j</artifactId>
+    <packaging>pom</packaging>
+    <version>3.2.1</version>
+    <name>DataNucleus JDO Neo4j Library</name>
+    <description>DataNucleus AccessPlatform libraries for JDO use with Neo4j</description>
+    <url>http://www.datanucleus.org</url>
+
+    <repositories>
+        <repository>
+            <id>DN_M2_Repo</id>
+            <url>http://www.datanucleus.org/downloads/maven2/</url>
+        </repository>
+    </repositories>
+
+    <distributionManagement>
+        <snapshotRepository>
+            <id>datanucleus-nightly</id>
+            <name>DataNucleus Nightly</name>
+            <url>file:/home/jpox/htdocs/downloads/maven2-nightly/</url>
+            <uniqueVersion>false</uniqueVersion>
+        </snapshotRepository>
+        <repository>
+            <id>datanucleus</id>
+            <url>scpexe://www.datanucleus.org//home/jpox/htdocs/downloads/maven2/</url>
+        </repository>
+    </distributionManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>javax.jdo</groupId>
+            <artifactId>jdo-api</artifactId>
+            <version>3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.datanucleus</groupId>
+            <artifactId>datanucleus-core</artifactId>
+            <version>3.2.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.datanucleus</groupId>
+            <artifactId>datanucleus-api-jdo</artifactId>
+            <version>3.2.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.datanucleus</groupId>
+            <artifactId>datanucleus-jdo-query</artifactId>
+            <version>3.0.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.datanucleus</groupId>
+            <artifactId>datanucleus-neo4j</artifactId>
+            <version>3.2.1</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <extensions> 
+            <extension> 
+                <groupId>org.apache.maven.wagon</groupId> 
+                <artifactId>wagon-ssh-external</artifactId> 
+                <version>2.2</version> 
+            </extension> 
+        </extensions> 
+    </build>
+</project>

Added: platform/accessplatform-jdo-odf/trunk/pom.xml
===================================================================
--- platform/accessplatform-jdo-odf/trunk/pom.xml	                        (rev 0)
+++ platform/accessplatform-jdo-odf/trunk/pom.xml	2013-05-14 18:05:39 UTC (rev 17083)
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.datanucleus</groupId>
+    <artifactId>datanucleus-accessplatform-jdo-odf</artifactId>
+    <packaging>pom</packaging>
+    <version>3.2.1</version>
+    <name>DataNucleus JDO ODF Library</name>
+    <description>DataNucleus AccessPlatform libraries for JDO use with ODF</description>
+    <url>http://www.datanucleus.org</url>
+
+    <repositories>
+        <repository>
+            <id>DN_M2_Repo</id>
+            <url>http://www.datanucleus.org/downloads/maven2/</url>
+        </repository>
+    </repositories>
+
+    <distributionManagement>
+        <snapshotRepository>
+            <id>datanucleus-nightly</id>
+            <name>DataNucleus Nightly</name>
+            <url>file:/home/jpox/htdocs/downloads/maven2-nightly/</url>
+            <uniqueVersion>false</uniqueVersion>
+        </snapshotRepository>
+        <repository>
+            <id>datanucleus</id>
+            <url>scpexe://www.datanucleus.org//home/jpox/htdocs/downloads/maven2/</url>
+        </repository>
+    </distributionManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>javax.jdo</groupId>
+            <artifactId>jdo-api</artifactId>
+            <version>3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.datanucleus</groupId>
+            <artifactId>datanucleus-core</artifactId>
+            <version>3.2.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.datanucleus</groupId>
+            <artifactId>datanucleus-api-jdo</artifactId>
+            <version>3.2.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.datanucleus</groupId>
+            <artifactId>datanucleus-jdo-query</artifactId>
+            <version>3.0.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.datanucleus</groupId>
+            <artifactId>datanucleus-odf</artifactId>
+            <version>3.2.0-release</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <extensions> 
+            <extension> 
+                <groupId>org.apache.maven.wagon</groupId> 
+                <artifactId>wagon-ssh-external</artifactId> 
+                <version>2.2</version> 
+            </extension> 
+        </extensions> 
+    </build>
+</project>

Added: platform/accessplatform-jdo-rdbms/trunk/pom.xml
===================================================================
--- platform/accessplatform-jdo-rdbms/trunk/pom.xml	                        (rev 0)
+++ platform/accessplatform-jdo-rdbms/trunk/pom.xml	2013-05-14 18:05:39 UTC (rev 17083)
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.datanucleus</groupId>
+    <artifactId>datanucleus-accessplatform-jdo-rdbms</artifactId>
+    <packaging>pom</packaging>
+    <version>3.2.1</version>
+    <name>DataNucleus JDO RDBMS Library</name>
+    <description>DataNucleus AccessPlatform libraries for JDO use with RDBMS</description>
+    <url>http://www.datanucleus.org</url>
+
+    <repositories>
+        <repository>
+            <id>DN_M2_Repo</id>
+            <url>http://www.datanucleus.org/downloads/maven2/</url>
+        </repository>
+    </repositories>
+
+    <distributionManagement>
+        <snapshotRepository>
+            <id>datanucleus-nightly</id>
+            <name>DataNucleus Nightly</name>
+            <url>file:/home/jpox/htdocs/downloads/maven2-nightly/</url>
+            <uniqueVersion>false</uniqueVersion>
+        </snapshotRepository>
+        <repository>
+            <id>datanucleus</id>
+            <url>scpexe://www.datanucleus.org//home/jpox/htdocs/downloads/maven2/</url>
+        </repository>
+    </distributionManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>javax.jdo</groupId>
+            <artifactId>jdo-api</artifactId>
+            <version>3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.datanucleus</groupId>
+            <artifactId>datanucleus-core</artifactId>
+            <version>3.2.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.datanucleus</groupId>
+            <artifactId>datanucleus-api-jdo</artifactId>
+            <version>3.2.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.datanucleus</groupId>
+            <artifactId>datanucleus-jdo-query</artifactId>
+            <version>3.0.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.datanucleus</groupId>
+            <artifactId>datanucleus-rdbms</artifactId>
+            <version>3.2.1</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <extensions> 
+            <extension> 
+                <groupId>org.apache.maven.wagon</groupId> 
+                <artifactId>wagon-ssh-external</artifactId> 
+                <version>2.2</version> 
+            </extension> 
+        </extensions> 
+    </build>
+</project>

Added: platform/accessplatform-jdo-xml/trunk/pom.xml
===================================================================
--- platform/accessplatform-jdo-xml/trunk/pom.xml	                        (rev 0)
+++ platform/accessplatform-jdo-xml/trunk/pom.xml	2013-05-14 18:05:39 UTC (rev 17083)
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.datanucleus</groupId>
+    <artifactId>datanucleus-accessplatform-jdo-xml</artifactId>
+    <packaging>pom</packaging>
+    <version>3.2.1</version>
+    <name>DataNucleus JDO XML Library</name>
+    <description>DataNucleus AccessPlatform libraries for JDO use with XML</description>
+    <url>http://www.datanucleus.org</url>
+
+    <repositories>
+        <repository>
+            <id>DN_M2_Repo</id>
+            <url>http://www.datanucleus.org/downloads/maven2/</url>
+        </repository>
+    </repositories>
+
+    <distributionManagement>
+        <snapshotRepository>
+            <id>datanucleus-nightly</id>
+            <name>DataNucleus Nightly</name>
+            <url>file:/home/jpox/htdocs/downloads/maven2-nightly/</url>
+            <uniqueVersion>false</uniqueVersion>
+        </snapshotRepository>
+        <repository>
+            <id>datanucleus</id>
+            <url>scpexe://www.datanucleus.org//home/jpox/htdocs/downloads/maven2/</url>
+        </repository>
+    </distributionManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>javax.jdo</groupId>
+            <artifactId>jdo-api</artifactId>
+            <version>3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.datanucleus</groupId>
+            <artifactId>datanucleus-core</artifactId>
+            <version>3.2.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.datanucleus</groupId>
+            <artifactId>datanucleus-api-jdo</artifactId>
+            <version>3.2.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.datanucleus</groupId>
+            <artifactId>datanucleus-jdo-query</artifactId>
+            <version>3.0.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.datanucleus</groupId>
+            <artifactId>datanucleus-xml</artifactId>
+            <version>3.2.0-release</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <extensions> 
+            <extension> 
+                <groupId>org.apache.maven.wagon</groupId> 
+                <artifactId>wagon-ssh-external</artifactId> 
+                <version>2.2</version> 
+            </extension> 
+        </extensions> 
+    </build>
+</project>

Added: platform/accessplatform-jpa-rdbms/trunk/pom.xml
===================================================================
--- platform/accessplatform-jpa-rdbms/trunk/pom.xml	                        (rev 0)
+++ platform/accessplatform-jpa-rdbms/trunk/pom.xml	2013-05-14 18:05:39 UTC (rev 17083)
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.datanucleus</groupId>
+    <artifactId>datanucleus-accessplatform-jpa-rdbms</artifactId>
+    <packaging>pom</packaging>
+    <version>3.2.1</version>
+    <name>DataNucleus JPA RDBMS Library</name>
+    <description>DataNucleus AccessPlatform libraries for JPA use with RDBMS</description>
+    <url>http://www.datanucleus.org</url>
+
+    <repositories>
+        <repository>
+            <id>DN_M2_Repo</id>
+            <url>http://www.datanucleus.org/downloads/maven2/</url>
+        </repository>
+    </repositories>
+
+    <distributionManagement>
+        <snapshotRepository>
+            <id>datanucleus-nightly</id>
+            <name>DataNucleus Nightly</name>
+            <url>file:/home/jpox/htdocs/downloads/maven2-nightly/</url>
+            <uniqueVersion>false</uniqueVersion>
+        </snapshotRepository>
+        <repository>
+            <id>datanucleus</id>
+            <url>scpexe://www.datanucleus.org//home/jpox/htdocs/downloads/maven2/</url>
+        </repository>
+    </distributionManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>javax.jdo</groupId>
+            <artifactId>jdo-api</artifactId>
+            <version>3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jpa_2.0_spec</artifactId>
+            <version>1.1</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.datanucleus</groupId>
+            <artifactId>datanucleus-core</artifactId>
+            <version>3.2.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.datanucleus</groupId>
+            <artifactId>datanucleus-api-jpa</artifactId>
+            <version>3.2.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.datanucleus</groupId>
+            <artifactId>datanucleus-jpa-query</artifactId>
+            <version>3.0.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.datanucleus</groupId>
+            <artifactId>datanucleus-rdbms</artifactId>
+            <version>3.2.1</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <extensions> 
+            <extension> 
+                <groupId>org.apache.maven.wagon</groupId> 
+                <artifactId>wagon-ssh-external</artifactId> 
+                <version>2.2</version> 
+            </extension> 
+        </extensions> 
+    </build>
+</project>

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

[DataNucleus-commits] SF.net SVN: datanucleus:[17118] platform

From: <andy_jefferson@us...> - 2013-05-14 18:39

Revision: 17118
          http://sourceforge.net/p/datanucleus/code/17118
Author:   andy_jefferson
Date:     2013-05-14 18:39:12 +0000 (Tue, 14 May 2013)
Log Message:
-----------


Property Changed:
----------------
    platform/accessplatform-jdo-json/trunk/
    platform/accessplatform-jdo-mongodb/trunk/

Index: platform/accessplatform-jdo-json/trunk
===================================================================
--- platform/accessplatform-jdo-json/trunk	2013-05-14 18:37:26 UTC (rev 17117)
+++ platform/accessplatform-jdo-json/trunk	2013-05-14 18:39:12 UTC (rev 17118)

Property changes on: platform/accessplatform-jdo-json/trunk
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+target
Index: platform/accessplatform-jdo-mongodb/trunk
===================================================================
--- platform/accessplatform-jdo-mongodb/trunk	2013-05-14 18:37:26 UTC (rev 17117)
+++ platform/accessplatform-jdo-mongodb/trunk	2013-05-14 18:39:12 UTC (rev 17118)

Property changes on: platform/accessplatform-jdo-mongodb/trunk
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+target
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[DataNucleus-commits] SF.net SVN: datanucleus:[17155] platform

From: <andy_jefferson@us...> - 2013-05-15 07:19

Revision: 17155
          http://sourceforge.net/p/datanucleus/code/17155
Author:   andy_jefferson
Date:     2013-05-15 07:19:00 +0000 (Wed, 15 May 2013)
Log Message:
-----------
put version on export/import

Modified Paths:
--------------
    platform/local.repository/trunk/META-INF/MANIFEST.MF
    platform/store.odf/trunk/META-INF/MANIFEST.MF

Modified: platform/local.repository/trunk/META-INF/MANIFEST.MF
===================================================================
--- platform/local.repository/trunk/META-INF/MANIFEST.MF	2013-05-15 07:16:10 UTC (rev 17154)
+++ platform/local.repository/trunk/META-INF/MANIFEST.MF	2013-05-15 07:19:00 UTC (rev 17155)
@@ -587,84 +587,84 @@
  org.neodatis.odb.impl.tool,
  org.objectweb.asm;version="4.0.0",
  org.objectweb.asm.signature;version="4.0.0",
- org.odftoolkit.odfdom,
- org.odftoolkit.odfdom.doc,
- org.odftoolkit.odfdom.doc.anim,
- org.odftoolkit.odfdom.doc.chart,
- org.odftoolkit.odfdom.doc.config,
- org.odftoolkit.odfdom.doc.db,
- org.odftoolkit.odfdom.doc.dc,
- org.odftoolkit.odfdom.doc.dr3d,
- org.odftoolkit.odfdom.doc.draw,
- org.odftoolkit.odfdom.doc.form,
- org.odftoolkit.odfdom.doc.math,
- org.odftoolkit.odfdom.doc.meta,
- org.odftoolkit.odfdom.doc.number,
- org.odftoolkit.odfdom.doc.office,
- org.odftoolkit.odfdom.doc.presentation,
- org.odftoolkit.odfdom.doc.script,
- org.odftoolkit.odfdom.doc.style,
- org.odftoolkit.odfdom.doc.svg,
- org.odftoolkit.odfdom.doc.table,
- org.odftoolkit.odfdom.doc.text,
- org.odftoolkit.odfdom.doc.xforms,
- org.odftoolkit.odfdom.dom,
- org.odftoolkit.odfdom.dom.attribute.anim,
- org.odftoolkit.odfdom.dom.attribute.chart,
- org.odftoolkit.odfdom.dom.attribute.config,
- org.odftoolkit.odfdom.dom.attribute.db,
- org.odftoolkit.odfdom.dom.attribute.dr3d,
- org.odftoolkit.odfdom.dom.attribute.draw,
- org.odftoolkit.odfdom.dom.attribute.fo,
- org.odftoolkit.odfdom.dom.attribute.form,
- org.odftoolkit.odfdom.dom.attribute.grddl,
- org.odftoolkit.odfdom.dom.attribute.meta,
- org.odftoolkit.odfdom.dom.attribute.number,
- org.odftoolkit.odfdom.dom.attribute.office,
- org.odftoolkit.odfdom.dom.attribute.presentation,
- org.odftoolkit.odfdom.dom.attribute.script,
- org.odftoolkit.odfdom.dom.attribute.smil,
- org.odftoolkit.odfdom.dom.attribute.style,
- org.odftoolkit.odfdom.dom.attribute.svg,
- org.odftoolkit.odfdom.dom.attribute.table,
- org.odftoolkit.odfdom.dom.attribute.text,
- org.odftoolkit.odfdom.dom.attribute.xforms,
- org.odftoolkit.odfdom.dom.attribute.xhtml,
- org.odftoolkit.odfdom.dom.attribute.xlink,
- org.odftoolkit.odfdom.dom.attribute.xml,
- org.odftoolkit.odfdom.dom.element,
- org.odftoolkit.odfdom.dom.element.anim,
- org.odftoolkit.odfdom.dom.element.chart,
- org.odftoolkit.odfdom.dom.element.config,
- org.odftoolkit.odfdom.dom.element.db,
- org.odftoolkit.odfdom.dom.element.dc,
- org.odftoolkit.odfdom.dom.element.dr3d,
- org.odftoolkit.odfdom.dom.element.draw,
- org.odftoolkit.odfdom.dom.element.form,
- org.odftoolkit.odfdom.dom.element.math,
- org.odftoolkit.odfdom.dom.element.meta,
- org.odftoolkit.odfdom.dom.element.number,
- org.odftoolkit.odfdom.dom.element.office,
- org.odftoolkit.odfdom.dom.element.presentation,
- org.odftoolkit.odfdom.dom.element.script,
- org.odftoolkit.odfdom.dom.element.style,
- org.odftoolkit.odfdom.dom.element.svg,
- org.odftoolkit.odfdom.dom.element.table,
- org.odftoolkit.odfdom.dom.element.text,
- org.odftoolkit.odfdom.dom.element.xforms,
- org.odftoolkit.odfdom.dom.style,
- org.odftoolkit.odfdom.dom.style.props,
- org.odftoolkit.odfdom.incubator.doc.draw,
- org.odftoolkit.odfdom.incubator.doc.number,
- org.odftoolkit.odfdom.incubator.doc.office,
- org.odftoolkit.odfdom.incubator.doc.style,
- org.odftoolkit.odfdom.incubator.doc.text,
- org.odftoolkit.odfdom.incubator.meta,
- org.odftoolkit.odfdom.incubator.search,
- org.odftoolkit.odfdom.pkg,
- org.odftoolkit.odfdom.pkg.element,
- org.odftoolkit.odfdom.pkg.manifest,
- org.odftoolkit.odfdom.type,
+ org.odftoolkit.odfdom;version="0.8.7",
+ org.odftoolkit.odfdom.doc;version="0.8.7",
+ org.odftoolkit.odfdom.doc.anim;version="0.8.7",
+ org.odftoolkit.odfdom.doc.chart;version="0.8.7",
+ org.odftoolkit.odfdom.doc.config;version="0.8.7",
+ org.odftoolkit.odfdom.doc.db;version="0.8.7",
+ org.odftoolkit.odfdom.doc.dc;version="0.8.7",
+ org.odftoolkit.odfdom.doc.dr3d;version="0.8.7",
+ org.odftoolkit.odfdom.doc.draw;version="0.8.7",
+ org.odftoolkit.odfdom.doc.form;version="0.8.7",
+ org.odftoolkit.odfdom.doc.math;version="0.8.7",
+ org.odftoolkit.odfdom.doc.meta;version="0.8.7",
+ org.odftoolkit.odfdom.doc.number;version="0.8.7",
+ org.odftoolkit.odfdom.doc.office;version="0.8.7",
+ org.odftoolkit.odfdom.doc.presentation;version="0.8.7",
+ org.odftoolkit.odfdom.doc.script;version="0.8.7",
+ org.odftoolkit.odfdom.doc.style;version="0.8.7",
+ org.odftoolkit.odfdom.doc.svg;version="0.8.7",
+ org.odftoolkit.odfdom.doc.table;version="0.8.7",
+ org.odftoolkit.odfdom.doc.text;version="0.8.7",
+ org.odftoolkit.odfdom.doc.xforms;version="0.8.7",
+ org.odftoolkit.odfdom.dom;version="0.8.7",
+ org.odftoolkit.odfdom.dom.attribute.anim;version="0.8.7",
+ org.odftoolkit.odfdom.dom.attribute.chart;version="0.8.7",
+ org.odftoolkit.odfdom.dom.attribute.config;version="0.8.7",
+ org.odftoolkit.odfdom.dom.attribute.db;version="0.8.7",
+ org.odftoolkit.odfdom.dom.attribute.dr3d;version="0.8.7",
+ org.odftoolkit.odfdom.dom.attribute.draw;version="0.8.7",
+ org.odftoolkit.odfdom.dom.attribute.fo;version="0.8.7",
+ org.odftoolkit.odfdom.dom.attribute.form;version="0.8.7",
+ org.odftoolkit.odfdom.dom.attribute.grddl;version="0.8.7",
+ org.odftoolkit.odfdom.dom.attribute.meta;version="0.8.7",
+ org.odftoolkit.odfdom.dom.attribute.number;version="0.8.7",
+ org.odftoolkit.odfdom.dom.attribute.office;version="0.8.7",
+ org.odftoolkit.odfdom.dom.attribute.presentation;version="0.8.7",
+ org.odftoolkit.odfdom.dom.attribute.script;version="0.8.7",
+ org.odftoolkit.odfdom.dom.attribute.smil;version="0.8.7",
+ org.odftoolkit.odfdom.dom.attribute.style;version="0.8.7",
+ org.odftoolkit.odfdom.dom.attribute.svg;version="0.8.7",
+ org.odftoolkit.odfdom.dom.attribute.table;version="0.8.7",
+ org.odftoolkit.odfdom.dom.attribute.text;version="0.8.7",
+ org.odftoolkit.odfdom.dom.attribute.xforms;version="0.8.7",
+ org.odftoolkit.odfdom.dom.attribute.xhtml;version="0.8.7",
+ org.odftoolkit.odfdom.dom.attribute.xlink;version="0.8.7",
+ org.odftoolkit.odfdom.dom.attribute.xml;version="0.8.7",
+ org.odftoolkit.odfdom.dom.element;version="0.8.7",
+ org.odftoolkit.odfdom.dom.element.anim;version="0.8.7",
+ org.odftoolkit.odfdom.dom.element.chart;version="0.8.7",
+ org.odftoolkit.odfdom.dom.element.config;version="0.8.7",
+ org.odftoolkit.odfdom.dom.element.db;version="0.8.7",
+ org.odftoolkit.odfdom.dom.element.dc;version="0.8.7",
+ org.odftoolkit.odfdom.dom.element.dr3d;version="0.8.7",
+ org.odftoolkit.odfdom.dom.element.draw;version="0.8.7",
+ org.odftoolkit.odfdom.dom.element.form;version="0.8.7",
+ org.odftoolkit.odfdom.dom.element.math;version="0.8.7",
+ org.odftoolkit.odfdom.dom.element.meta;version="0.8.7",
+ org.odftoolkit.odfdom.dom.element.number;version="0.8.7",
+ org.odftoolkit.odfdom.dom.element.office;version="0.8.7",
+ org.odftoolkit.odfdom.dom.element.presentation;version="0.8.7",
+ org.odftoolkit.odfdom.dom.element.script;version="0.8.7",
+ org.odftoolkit.odfdom.dom.element.style;version="0.8.7",
+ org.odftoolkit.odfdom.dom.element.svg;version="0.8.7",
+ org.odftoolkit.odfdom.dom.element.table;version="0.8.7",
+ org.odftoolkit.odfdom.dom.element.text;version="0.8.7",
+ org.odftoolkit.odfdom.dom.element.xforms;version="0.8.7",
+ org.odftoolkit.odfdom.dom.style;version="0.8.7",
+ org.odftoolkit.odfdom.dom.style.props;version="0.8.7",
+ org.odftoolkit.odfdom.incubator.doc.draw;version="0.8.7",
+ org.odftoolkit.odfdom.incubator.doc.number;version="0.8.7",
+ org.odftoolkit.odfdom.incubator.doc.office;version="0.8.7",
+ org.odftoolkit.odfdom.incubator.doc.style;version="0.8.7",
+ org.odftoolkit.odfdom.incubator.doc.text;version="0.8.7",
+ org.odftoolkit.odfdom.incubator.meta;version="0.8.7",
+ org.odftoolkit.odfdom.incubator.search;version="0.8.7",
+ org.odftoolkit.odfdom.pkg;version="0.8.7",
+ org.odftoolkit.odfdom.pkg.element;version="0.8.7",
+ org.odftoolkit.odfdom.pkg.manifest;version="0.8.7",
+ org.odftoolkit.odfdom.type;version="0.8.7",
  org.postgis,
  org.postgis.binary,
  org.postgis.java2d,

Modified: platform/store.odf/trunk/META-INF/MANIFEST.MF
===================================================================
--- platform/store.odf/trunk/META-INF/MANIFEST.MF	2013-05-15 07:16:10 UTC (rev 17154)
+++ platform/store.odf/trunk/META-INF/MANIFEST.MF	2013-05-15 07:19:00 UTC (rev 17155)
@@ -38,16 +38,16 @@
  org.apache.xerces.xpointer,
  org.apache.xerces.xs,
  org.apache.xerces.xs.datatypes,
- org.odftoolkit.odfdom,
- org.odftoolkit.odfdom.doc,
- org.odftoolkit.odfdom.doc.style,
- org.odftoolkit.odfdom.doc.table,
- org.odftoolkit.odfdom.dom,
- org.odftoolkit.odfdom.dom.attribute.office,
- org.odftoolkit.odfdom.dom.element,
- org.odftoolkit.odfdom.dom.element.style,
- org.odftoolkit.odfdom.dom.style,
- org.odftoolkit.odfdom.dom.style.props,
- org.odftoolkit.odfdom.incubator.doc.office,
- org.odftoolkit.odfdom.incubator.doc.style,
- org.odftoolkit.odfdom.pkg
+ org.odftoolkit.odfdom;version="0.8.7",
+ org.odftoolkit.odfdom.doc;version="0.8.7",
+ org.odftoolkit.odfdom.doc.style;version="0.8.7",
+ org.odftoolkit.odfdom.doc.table;version="0.8.7",
+ org.odftoolkit.odfdom.dom;version="0.8.7",
+ org.odftoolkit.odfdom.dom.attribute.office;version="0.8.7",
+ org.odftoolkit.odfdom.dom.element;version="0.8.7",
+ org.odftoolkit.odfdom.dom.element.style;version="0.8.7",
+ org.odftoolkit.odfdom.dom.style;version="0.8.7",
+ org.odftoolkit.odfdom.dom.style.props;version="0.8.7",
+ org.odftoolkit.odfdom.incubator.doc.office;version="0.8.7",
+ org.odftoolkit.odfdom.incubator.doc.style;version="0.8.7",
+ org.odftoolkit.odfdom.pkg;version="0.8.7"

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

[DataNucleus-commits] SF.net SVN: datanucleus:[17158] platform

From: <andy_jefferson@us...> - 2013-05-15 08:48

Revision: 17158
          http://sourceforge.net/p/datanucleus/code/17158
Author:   andy_jefferson
Date:     2013-05-15 08:48:29 +0000 (Wed, 15 May 2013)
Log Message:
-----------
bump MANIFEST version, and remove unnecessary repository out of some POMs

Modified Paths:
--------------
    platform/core/trunk/META-INF/MANIFEST.MF
    platform/core/trunk/pom.xml
    platform/store.excel/trunk/META-INF/MANIFEST.MF
    platform/store.excel/trunk/pom.xml
    platform/store.hbase/trunk/META-INF/MANIFEST.MF
    platform/store.hbase/trunk/pom.xml
    platform/store.json/trunk/META-INF/MANIFEST.MF
    platform/store.json/trunk/pom.xml
    platform/store.ldap/trunk/META-INF/MANIFEST.MF
    platform/store.ldap/trunk/pom.xml
    platform/store.mongodb/trunk/META-INF/MANIFEST.MF
    platform/store.mongodb/trunk/pom.xml
    platform/store.neo4j/trunk/META-INF/MANIFEST.MF
    platform/store.neo4j/trunk/pom.xml
    platform/store.neodatis/trunk/META-INF/MANIFEST.MF
    platform/store.neodatis/trunk/pom.xml
    platform/store.odf/trunk/META-INF/MANIFEST.MF
    platform/store.odf/trunk/pom.xml
    platform/store.rdbms/trunk/META-INF/MANIFEST.MF
    platform/store.rdbms/trunk/pom.xml
    platform/store.xml/trunk/META-INF/MANIFEST.MF
    platform/store.xml/trunk/pom.xml

Modified: platform/core/trunk/META-INF/MANIFEST.MF
===================================================================
--- platform/core/trunk/META-INF/MANIFEST.MF	2013-05-15 08:00:44 UTC (rev 17157)
+++ platform/core/trunk/META-INF/MANIFEST.MF	2013-05-15 08:48:29 UTC (rev 17158)
@@ -3,56 +3,56 @@
 Bundle-Name: DataNucleus Core
 Bundle-SymbolicName: org.datanucleus;singleton:=true
 Bundle-Vendor: DataNucleus
-Bundle-Version: 3.2.3
+Bundle-Version: 3.2.4
 Require-Bundle: org.eclipse.equinox.registry;resolution:=optional,
  org.eclipse.core.runtime;resolution:=optional
-Export-Package: org.datanucleus;version="3.2.3",
- org.datanucleus.api;version="3.2.3",
- org.datanucleus.cache;version="3.2.3",
- org.datanucleus.enhancer;version="3.2.3",
- org.datanucleus.enhancer.jdo;version="3.2.3",
- org.datanucleus.exceptions;version="3.2.3",
- org.datanucleus.flush;version="3.2.3",
- org.datanucleus.identity;version="3.2.3",
- org.datanucleus.management;version="3.2.3",
- org.datanucleus.management.jmx;version="3.2.3",
- org.datanucleus.metadata;version="3.2.3",
- org.datanucleus.metadata.annotations;version="3.2.3",
- org.datanucleus.metadata.xml;version="3.2.3",
- org.datanucleus.plugin;version="3.2.3",
- org.datanucleus.properties;version="3.2.3",
- org.datanucleus.query;version="3.2.3",
- org.datanucleus.query.cache;version="3.2.3",
- org.datanucleus.query.compiler;version="3.2.3",
- org.datanucleus.query.evaluator;version="3.2.3",
- org.datanucleus.query.evaluator.memory;version="3.2.3",
- org.datanucleus.query.expression;version="3.2.3",
- org.datanucleus.query.node;version="3.2.3",
- org.datanucleus.query.symbol;version="3.2.3",
- org.datanucleus.state;version="3.2.3",
- org.datanucleus.store;version="3.2.3",
- org.datanucleus.store.autostart;version="3.2.3",
- org.datanucleus.store.connection;version="3.2.3",
- org.datanucleus.store.encryption;version="3.2.3",
- org.datanucleus.store.exceptions;version="3.2.3",
- org.datanucleus.store.federation;version="3.2.3",
- org.datanucleus.store.fieldmanager;version="3.2.3",
- org.datanucleus.store.objectvaluegenerator;version="3.2.3",
- org.datanucleus.store.query;version="3.2.3",
- org.datanucleus.store.query.cache;version="3.2.3",
- org.datanucleus.store.schema;version="3.2.3",
- org.datanucleus.store.schema.naming;version="3.2.3",
- org.datanucleus.store.schema.table;version="3.2.3",
- org.datanucleus.store.scostore;version="3.2.3",
- org.datanucleus.store.types;version="3.2.3",
- org.datanucleus.store.types.backed;version="3.2.3",
- org.datanucleus.store.types.converters;version="3.2.3",
- org.datanucleus.store.types.simple;version="3.2.3",
- org.datanucleus.store.valuegenerator;version="3.2.3",
- org.datanucleus.transaction;version="3.2.3",
- org.datanucleus.transaction.jta;version="3.2.3",
- org.datanucleus.util;version="3.2.3",
- org.datanucleus.validation;version="3.2.3"
+Export-Package: org.datanucleus;version="3.2.4",
+ org.datanucleus.api;version="3.2.4",
+ org.datanucleus.cache;version="3.2.4",
+ org.datanucleus.enhancer;version="3.2.4",
+ org.datanucleus.enhancer.jdo;version="3.2.4",
+ org.datanucleus.exceptions;version="3.2.4",
+ org.datanucleus.flush;version="3.2.4",
+ org.datanucleus.identity;version="3.2.4",
+ org.datanucleus.management;version="3.2.4",
+ org.datanucleus.management.jmx;version="3.2.4",
+ org.datanucleus.metadata;version="3.2.4",
+ org.datanucleus.metadata.annotations;version="3.2.4",
+ org.datanucleus.metadata.xml;version="3.2.4",
+ org.datanucleus.plugin;version="3.2.4",
+ org.datanucleus.properties;version="3.2.4",
+ org.datanucleus.query;version="3.2.4",
+ org.datanucleus.query.cache;version="3.2.4",
+ org.datanucleus.query.compiler;version="3.2.4",
+ org.datanucleus.query.evaluator;version="3.2.4",
+ org.datanucleus.query.evaluator.memory;version="3.2.4",
+ org.datanucleus.query.expression;version="3.2.4",
+ org.datanucleus.query.node;version="3.2.4",
+ org.datanucleus.query.symbol;version="3.2.4",
+ org.datanucleus.state;version="3.2.4",
+ org.datanucleus.store;version="3.2.4",
+ org.datanucleus.store.autostart;version="3.2.4",
+ org.datanucleus.store.connection;version="3.2.4",
+ org.datanucleus.store.encryption;version="3.2.4",
+ org.datanucleus.store.exceptions;version="3.2.4",
+ org.datanucleus.store.federation;version="3.2.4",
+ org.datanucleus.store.fieldmanager;version="3.2.4",
+ org.datanucleus.store.objectvaluegenerator;version="3.2.4",
+ org.datanucleus.store.query;version="3.2.4",
+ org.datanucleus.store.query.cache;version="3.2.4",
+ org.datanucleus.store.schema;version="3.2.4",
+ org.datanucleus.store.schema.naming;version="3.2.4",
+ org.datanucleus.store.schema.table;version="3.2.4",
+ org.datanucleus.store.scostore;version="3.2.4",
+ org.datanucleus.store.types;version="3.2.4",
+ org.datanucleus.store.types.backed;version="3.2.4",
+ org.datanucleus.store.types.converters;version="3.2.4",
+ org.datanucleus.store.types.simple;version="3.2.4",
+ org.datanucleus.store.valuegenerator;version="3.2.4",
+ org.datanucleus.transaction;version="3.2.4",
+ org.datanucleus.transaction.jta;version="3.2.4",
+ org.datanucleus.util;version="3.2.4",
+ org.datanucleus.validation;version="3.2.4"
 Import-Package: javax.annotation.processing;resolution:=optional,
  javax.cache;version="0.61.0";resolution:=optional,
  javax.jdo;version="3.0.0",

Modified: platform/core/trunk/pom.xml
===================================================================
--- platform/core/trunk/pom.xml	2013-05-15 08:00:44 UTC (rev 17157)
+++ platform/core/trunk/pom.xml	2013-05-15 08:48:29 UTC (rev 17158)
@@ -58,10 +58,6 @@
             <url>file:${user.home}/htdocs/downloads/maven2-nightly/</url>
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
-        <!--repository>
-            <id>datanucleus</id>
-            <url>scpexe://www.datanucleus.org//home/jpox/htdocs/downloads/maven2/</url>
-        </repository-->
     </distributionManagement>
 
     <dependencies>

Modified: platform/store.excel/trunk/META-INF/MANIFEST.MF
===================================================================
--- platform/store.excel/trunk/META-INF/MANIFEST.MF	2013-05-15 08:00:44 UTC (rev 17157)
+++ platform/store.excel/trunk/META-INF/MANIFEST.MF	2013-05-15 08:48:29 UTC (rev 17158)
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Excel Plug-in
 Bundle-SymbolicName: org.datanucleus.store.excel;singleton:=true
-Bundle-Version: 3.2.0.release
+Bundle-Version: 3.2.1
 Bundle-Vendor: DataNucleus
 Require-Bundle: org.datanucleus;bundle-version="3.2.0.m3"
 Import-Package: org.apache.poi.hssf.usermodel;version="3.5.0",

Modified: platform/store.excel/trunk/pom.xml
===================================================================
--- platform/store.excel/trunk/pom.xml	2013-05-15 08:00:44 UTC (rev 17157)
+++ platform/store.excel/trunk/pom.xml	2013-05-15 08:48:29 UTC (rev 17158)
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.datanucleus</groupId>
-    <version>3.2.0-release</version>
+    <version>3.2.1-SNAPSHOT</version>
     <artifactId>datanucleus-excel</artifactId>
     <name>DataNucleus EXCEL plugin</name>
     <description>
@@ -42,16 +42,6 @@
         </developer>
     </developers>
 
-    <repositories>
-        <repository>
-            <id>DN_M2_Repo</id>
-            <url>http://www.datanucleus.org/downloads/maven2/</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
     <distributionManagement>
         <snapshotRepository>
             <id>datanucleus-nightly</id>
@@ -59,10 +49,6 @@
             <url>file:${user.home}/htdocs/downloads/maven2-nightly/</url>
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
-        <!--repository>
-            <id>datanucleus</id>
-            <url>scpexe://www.datanucleus.org//home/jpox/htdocs/downloads/maven2/</url>
-        </repository-->
     </distributionManagement>
 
     <dependencies>

Modified: platform/store.hbase/trunk/META-INF/MANIFEST.MF
===================================================================
--- platform/store.hbase/trunk/META-INF/MANIFEST.MF	2013-05-15 08:00:44 UTC (rev 17157)
+++ platform/store.hbase/trunk/META-INF/MANIFEST.MF	2013-05-15 08:48:29 UTC (rev 17158)
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: HBase Plug-in
 Bundle-SymbolicName: org.datanucleus.store.hbase;singleton:=true
-Bundle-Version: 3.2.1
+Bundle-Version: 3.2.2
 Bundle-Vendor: DataNucleus
 Require-Bundle: org.datanucleus;bundle-version="3.2.0.m3"
 Import-Package: org.apache.hadoop.conf,

Modified: platform/store.hbase/trunk/pom.xml
===================================================================
--- platform/store.hbase/trunk/pom.xml	2013-05-15 08:00:44 UTC (rev 17157)
+++ platform/store.hbase/trunk/pom.xml	2013-05-15 08:48:29 UTC (rev 17158)
@@ -40,16 +40,6 @@
         </developer>
     </developers>
 
-    <repositories>
-        <repository>
-            <id>DN_M2_Repo</id>
-            <url>http://www.datanucleus.org/downloads/maven2/</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
     <distributionManagement>
         <snapshotRepository>
             <id>datanucleus-nightly</id>
@@ -57,10 +47,6 @@
             <url>file:${user.home}/htdocs/downloads/maven2-nightly/</url>
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
-        <!--repository>
-            <id>datanucleus</id>
-            <url>scpexe://www.datanucleus.org//home/jpox/htdocs/downloads/maven2/</url>
-        </repository-->
     </distributionManagement>
 
     <dependencies>

Modified: platform/store.json/trunk/META-INF/MANIFEST.MF
===================================================================
--- platform/store.json/trunk/META-INF/MANIFEST.MF	2013-05-15 08:00:44 UTC (rev 17157)
+++ platform/store.json/trunk/META-INF/MANIFEST.MF	2013-05-15 08:48:29 UTC (rev 17158)
@@ -2,6 +2,6 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: JSON Plug-in
 Bundle-SymbolicName: org.datanucleus.store.json;singleton:=true
-Bundle-Version: 3.2.0.release
+Bundle-Version: 3.2.1
 Bundle-Vendor: DataNucleus
 Require-Bundle: org.datanucleus;bundle-version="3.2.0.m3"

Modified: platform/store.json/trunk/pom.xml
===================================================================
--- platform/store.json/trunk/pom.xml	2013-05-15 08:00:44 UTC (rev 17157)
+++ platform/store.json/trunk/pom.xml	2013-05-15 08:48:29 UTC (rev 17158)
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.datanucleus</groupId>
-    <version>3.2.0-release</version>
+    <version>3.2.1-SNAPSHOT</version>
     <artifactId>datanucleus-json</artifactId>
     <name>DataNucleus JSON plugin</name>
     <description>
@@ -43,15 +43,6 @@
         </developer>
     </developers>
 
-    <repositories>
-        <repository>
-            <id>DN_M2_Repo</id>
-            <url>http://www.datanucleus.org/downloads/maven2/</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
     <distributionManagement>
         <snapshotRepository>
             <id>datanucleus-nightly</id>
@@ -59,10 +50,6 @@
             <url>file:${user.home}/htdocs/downloads/maven2-nightly/</url>
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
-        <!--repository>
-            <id>datanucleus</id>
-            <url>scpexe://www.datanucleus.org//home/jpox/htdocs/downloads/maven2/</url>
-        </repository-->
     </distributionManagement>
 
     <dependencies>

Modified: platform/store.ldap/trunk/META-INF/MANIFEST.MF
===================================================================
--- platform/store.ldap/trunk/META-INF/MANIFEST.MF	2013-05-15 08:00:44 UTC (rev 17157)
+++ platform/store.ldap/trunk/META-INF/MANIFEST.MF	2013-05-15 08:48:29 UTC (rev 17158)
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: DataNucleus LDAP
 Bundle-SymbolicName: org.datanucleus.store.ldap;singleton:=true
-Bundle-Version: 3.2.2
+Bundle-Version: 3.2.3
 Bundle-Vendor: DataNucleus
 Require-Bundle: org.datanucleus;bundle-version="3.2.2"
 Import-Package: javax.jdo,

Modified: platform/store.ldap/trunk/pom.xml
===================================================================
--- platform/store.ldap/trunk/pom.xml	2013-05-15 08:00:44 UTC (rev 17157)
+++ platform/store.ldap/trunk/pom.xml	2013-05-15 08:48:29 UTC (rev 17158)
@@ -40,16 +40,6 @@
         </developer>
     </developers>
 
-    <repositories>
-        <repository>
-            <id>DN_M2_Repo</id>
-            <url>http://www.datanucleus.org/downloads/maven2/</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
     <distributionManagement>
         <snapshotRepository>
             <id>datanucleus-nightly</id>
@@ -57,10 +47,6 @@
             <url>file:${user.home}/htdocs/downloads/maven2-nightly/</url>
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
-        <!--repository>
-            <id>datanucleus</id>
-            <url>scpexe://www.datanucleus.org//home/jpox/htdocs/downloads/maven2/</url>
-        </repository-->
     </distributionManagement>
 
     <dependencies>

Modified: platform/store.mongodb/trunk/META-INF/MANIFEST.MF
===================================================================
--- platform/store.mongodb/trunk/META-INF/MANIFEST.MF	2013-05-15 08:00:44 UTC (rev 17157)
+++ platform/store.mongodb/trunk/META-INF/MANIFEST.MF	2013-05-15 08:48:29 UTC (rev 17158)
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: MongoDB Plug-in
 Bundle-SymbolicName: org.datanucleus.store.mongodb;singleton:=true
-Bundle-Version: 3.2.1
+Bundle-Version: 3.2.2
 Bundle-Vendor: DataNucleus
 Require-Bundle: org.datanucleus;bundle-version="3.2.0.m3"
 Import-Package: com.mongodb;version="2.9.0",

Modified: platform/store.mongodb/trunk/pom.xml
===================================================================
--- platform/store.mongodb/trunk/pom.xml	2013-05-15 08:00:44 UTC (rev 17157)
+++ platform/store.mongodb/trunk/pom.xml	2013-05-15 08:48:29 UTC (rev 17158)
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 	<groupId>org.datanucleus</groupId>
-	<version>3.2.1</version>
+	<version>3.2.2-SNAPSHOT</version>
     <artifactId>datanucleus-mongodb</artifactId>
     <name>DataNucleus MongoDB plugin</name>
     <description>
@@ -42,16 +42,6 @@
         </developer>
     </developers>
 
-    <repositories>
-        <repository>
-            <id>DN_M2_Repo</id>
-            <url>http://www.datanucleus.org/downloads/maven2/</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
     <distributionManagement>
         <snapshotRepository>
             <id>datanucleus-nightly</id>
@@ -59,10 +49,6 @@
             <url>file:${user.home}/htdocs/downloads/maven2-nightly/</url>
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
-        <!--repository>
-            <id>datanucleus</id>
-            <url>scpexe://www.datanucleus.org//home/jpox/htdocs/downloads/maven2/</url>
-        </repository-->
     </distributionManagement>
 
     <dependencies>

Modified: platform/store.neo4j/trunk/META-INF/MANIFEST.MF
===================================================================
--- platform/store.neo4j/trunk/META-INF/MANIFEST.MF	2013-05-15 08:00:44 UTC (rev 17157)
+++ platform/store.neo4j/trunk/META-INF/MANIFEST.MF	2013-05-15 08:48:29 UTC (rev 17158)
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Neo4J Plug-in
 Bundle-SymbolicName: org.datanucleus.store.neo4j;singleton:=true
-Bundle-Version: 3.2.1
+Bundle-Version: 3.2.2
 Bundle-Vendor: DataNucleus
 Require-Bundle: org.datanucleus;bundle-version="3.2.0.m3"
 Import-Package: org.neo4j.cypher;version="1.7.0",

Modified: platform/store.neo4j/trunk/pom.xml
===================================================================
--- platform/store.neo4j/trunk/pom.xml	2013-05-15 08:00:44 UTC (rev 17157)
+++ platform/store.neo4j/trunk/pom.xml	2013-05-15 08:48:29 UTC (rev 17158)
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 	<groupId>org.datanucleus</groupId>
-	<version>3.2.1</version>
+	<version>3.2.2-SNAPSHOT</version>
     <artifactId>datanucleus-neo4j</artifactId>
     <name>DataNucleus Neo4j plugin</name>
     <description>
@@ -42,16 +42,6 @@
         </developer>
     </developers>
 
-    <repositories>
-        <repository>
-            <id>DN_M2_Repo</id>
-            <url>http://www.datanucleus.org/downloads/maven2/</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
     <distributionManagement>
         <snapshotRepository>
             <id>datanucleus-nightly</id>
@@ -59,10 +49,6 @@
             <url>file:${user.home}/htdocs/downloads/maven2-nightly/</url>
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
-        <!--repository>
-            <id>datanucleus</id>
-            <url>scpexe://www.datanucleus.org//home/jpox/htdocs/downloads/maven2/</url>
-        </repository-->
     </distributionManagement>
 
     <dependencies>

Modified: platform/store.neodatis/trunk/META-INF/MANIFEST.MF
===================================================================
--- platform/store.neodatis/trunk/META-INF/MANIFEST.MF	2013-05-15 08:00:44 UTC (rev 17157)
+++ platform/store.neodatis/trunk/META-INF/MANIFEST.MF	2013-05-15 08:48:29 UTC (rev 17158)
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: DataNucleus NeoDatis
 Bundle-SymbolicName: org.datanucleus.store.neodatis;singleton:=true
-Bundle-Version: 3.2.2
+Bundle-Version: 3.2.3
 Bundle-Localization: plugin
 Require-Bundle: org.datanucleus;bundle-version="3.2.2"
 Bundle-Vendor: DataNucleus

Modified: platform/store.neodatis/trunk/pom.xml
===================================================================
--- platform/store.neodatis/trunk/pom.xml	2013-05-15 08:00:44 UTC (rev 17157)
+++ platform/store.neodatis/trunk/pom.xml	2013-05-15 08:48:29 UTC (rev 17158)
@@ -40,16 +40,6 @@
         </developer>
     </developers>
 
-    <repositories>
-        <repository>
-            <id>DN_M2_Repo</id>
-            <url>http://www.datanucleus.org/downloads/maven2/</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
     <distributionManagement>
         <snapshotRepository>
             <id>datanucleus-nightly</id>
@@ -57,10 +47,6 @@
             <url>file:${user.home}/htdocs/downloads/maven2-nightly/</url>
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
-        <!--repository>
-            <id>datanucleus</id>
-            <url>scpexe://www.datanucleus.org//home/jpox/htdocs/downloads/maven2/</url>
-        </repository-->
     </distributionManagement>
 
     <dependencies>

Modified: platform/store.odf/trunk/META-INF/MANIFEST.MF
===================================================================
--- platform/store.odf/trunk/META-INF/MANIFEST.MF	2013-05-15 08:00:44 UTC (rev 17157)
+++ platform/store.odf/trunk/META-INF/MANIFEST.MF	2013-05-15 08:48:29 UTC (rev 17158)
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: ODF Plugin
 Bundle-SymbolicName: org.datanucleus.store.odf;singleton:=true
-Bundle-Version: 3.2.0.release
+Bundle-Version: 3.2.1
 Bundle-Vendor: DataNucleus
 Require-Bundle: org.datanucleus;bundle-version="3.2.0.m3"
 Import-Package: org.apache.xerces.dom,

Modified: platform/store.odf/trunk/pom.xml
===================================================================
--- platform/store.odf/trunk/pom.xml	2013-05-15 08:00:44 UTC (rev 17157)
+++ platform/store.odf/trunk/pom.xml	2013-05-15 08:48:29 UTC (rev 17158)
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 	<groupId>org.datanucleus</groupId>
-	<version>3.2.0-release</version>
+	<version>3.2.1-SNAPSHOT</version>
     <artifactId>datanucleus-odf</artifactId>
     <name>DataNucleus ODF plugin</name>
     <description>
@@ -42,16 +42,6 @@
         </developer>
     </developers>
 
-    <repositories>
-        <repository>
-            <id>DN_M2_Repo</id>
-            <url>http://www.datanucleus.org/downloads/maven2/</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
     <distributionManagement>
         <snapshotRepository>
             <id>datanucleus-nightly</id>
@@ -59,10 +49,6 @@
             <url>file:${user.home}/htdocs/downloads/maven2-nightly/</url>
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
-        <!--repository>
-            <id>datanucleus</id>
-            <url>scpexe://www.datanucleus.org//home/jpox/htdocs/downloads/maven2/</url>
-        </repository-->
     </distributionManagement>
 
     <dependencies>

Modified: platform/store.rdbms/trunk/META-INF/MANIFEST.MF
===================================================================
--- platform/store.rdbms/trunk/META-INF/MANIFEST.MF	2013-05-15 08:00:44 UTC (rev 17157)
+++ platform/store.rdbms/trunk/META-INF/MANIFEST.MF	2013-05-15 08:48:29 UTC (rev 17158)
@@ -3,30 +3,30 @@
 Bundle-Name: DataNucleus RDBMS
 Bundle-SymbolicName: org.datanucleus.store.rdbms;singleton:=true
 Bundle-Vendor: DataNucleus
-Bundle-Version: 3.2.2
-Require-Bundle: org.datanucleus;bundle-version="3.2.2"
-Export-Package: org.datanucleus.store.rdbms;version="3.2.2",
- org.datanucleus.store.rdbms.adapter;version="3.2.2",
- org.datanucleus.store.rdbms.autostart;version="3.2.2",
- org.datanucleus.store.rdbms.datasource;version="3.2.2",
- org.datanucleus.store.rdbms.exceptions;version="3.2.2",
- org.datanucleus.store.rdbms.fieldmanager;version="3.2.2",
- org.datanucleus.store.rdbms.identifier;version="3.2.2",
- org.datanucleus.store.rdbms.key;version="3.2.2",
- org.datanucleus.store.rdbms.mapping;version="3.2.2",
- org.datanucleus.store.rdbms.mapping.datastore;version="3.2.2",
- org.datanucleus.store.rdbms.mapping.java;version="3.2.2",
- org.datanucleus.store.rdbms.mapping.oracle;version="3.2.2",
- org.datanucleus.store.rdbms.query;version="3.2.2",
- org.datanucleus.store.rdbms.request;version="3.2.2",
- org.datanucleus.store.rdbms.schema;version="3.2.2",
- org.datanucleus.store.rdbms.scostore;version="3.2.2",
- org.datanucleus.store.rdbms.sql;version="3.2.2",
- org.datanucleus.store.rdbms.sql.expression;version="3.2.2",
- org.datanucleus.store.rdbms.sql.method;version="3.2.2",
- org.datanucleus.store.rdbms.sql.operation;version="3.2.2",
- org.datanucleus.store.rdbms.table;version="3.2.2",
- org.datanucleus.store.rdbms.valuegenerator;version="3.2.2"
+Bundle-Version: 3.2.3
+Require-Bundle: org.datanucleus;bundle-version="3.2.3"
+Export-Package: org.datanucleus.store.rdbms;version="3.2.3",
+ org.datanucleus.store.rdbms.adapter;version="3.2.3",
+ org.datanucleus.store.rdbms.autostart;version="3.2.3",
+ org.datanucleus.store.rdbms.datasource;version="3.2.3",
+ org.datanucleus.store.rdbms.exceptions;version="3.2.3",
+ org.datanucleus.store.rdbms.fieldmanager;version="3.2.3",
+ org.datanucleus.store.rdbms.identifier;version="3.2.3",
+ org.datanucleus.store.rdbms.key;version="3.2.3",
+ org.datanucleus.store.rdbms.mapping;version="3.2.3",
+ org.datanucleus.store.rdbms.mapping.datastore;version="3.2.3",
+ org.datanucleus.store.rdbms.mapping.java;version="3.2.3",
+ org.datanucleus.store.rdbms.mapping.oracle;version="3.2.3",
+ org.datanucleus.store.rdbms.query;version="3.2.3",
+ org.datanucleus.store.rdbms.request;version="3.2.3",
+ org.datanucleus.store.rdbms.schema;version="3.2.3",
+ org.datanucleus.store.rdbms.scostore;version="3.2.3",
+ org.datanucleus.store.rdbms.sql;version="3.2.3",
+ org.datanucleus.store.rdbms.sql.expression;version="3.2.3",
+ org.datanucleus.store.rdbms.sql.method;version="3.2.3",
+ org.datanucleus.store.rdbms.sql.operation;version="3.2.3",
+ org.datanucleus.store.rdbms.table;version="3.2.3",
+ org.datanucleus.store.rdbms.valuegenerator;version="3.2.3"
 Import-Package: com.ibm.db2.jcc;resolution:=optional,
  com.informix.jdbc;resolution:=optional,
  com.jolbox.bonecp;resolution:=optional,

Modified: platform/store.rdbms/trunk/pom.xml
===================================================================
--- platform/store.rdbms/trunk/pom.xml	2013-05-15 08:00:44 UTC (rev 17157)
+++ platform/store.rdbms/trunk/pom.xml	2013-05-15 08:48:29 UTC (rev 17158)
@@ -57,10 +57,6 @@
             <url>file:${user.home}/htdocs/downloads/maven2-nightly/</url>
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
-        <!--repository>
-            <id>datanucleus</id>
-            <url>scpexe://www.datanucleus.org//home/jpox/htdocs/downloads/maven2/</url>
-        </repository-->
     </distributionManagement>
 
     <dependencies>

Modified: platform/store.xml/trunk/META-INF/MANIFEST.MF
===================================================================
--- platform/store.xml/trunk/META-INF/MANIFEST.MF	2013-05-15 08:00:44 UTC (rev 17157)
+++ platform/store.xml/trunk/META-INF/MANIFEST.MF	2013-05-15 08:48:29 UTC (rev 17158)
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: DataNucleus XML
 Bundle-SymbolicName: org.datanucleus.store.xml;singleton:=true
-Bundle-Version: 3.2.0.release
+Bundle-Version: 3.2.1
 Bundle-Vendor: DataNucleus
 Require-Bundle: org.datanucleus;bundle-version="3.2.0.m3"
 Import-Package: javax.activation

Modified: platform/store.xml/trunk/pom.xml
===================================================================
--- platform/store.xml/trunk/pom.xml	2013-05-15 08:00:44 UTC (rev 17157)
+++ platform/store.xml/trunk/pom.xml	2013-05-15 08:48:29 UTC (rev 17158)
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 	<groupId>org.datanucleus</groupId>
-	<version>3.2.0-release</version>
+	<version>3.2.1-SNAPSHOT</version>
     <artifactId>datanucleus-xml</artifactId>
     <name>DataNucleus XML plugin</name>
     <description>
@@ -42,16 +42,6 @@
         </developer>
     </developers>
 
-    <repositories>
-        <repository>
-            <id>DN_M2_Repo</id>
-            <url>http://www.datanucleus.org/downloads/maven2/</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
     <distributionManagement>
         <snapshotRepository>
             <id>datanucleus-nightly</id>
@@ -59,10 +49,6 @@
             <url>file:${user.home}/htdocs/downloads/maven2-nightly/</url>
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
-        <!--repository>
-            <id>datanucleus</id>
-            <url>scpexe://www.datanucleus.org//home/jpox/htdocs/downloads/maven2/</url>
-        </repository-->
     </distributionManagement>
 
     <dependencies>

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

[DataNucleus-commits] SF.net SVN: datanucleus:[17159] platform

From: <andy_jefferson@us...> - 2013-05-15 08:52

Revision: 17159
          http://sourceforge.net/p/datanucleus/code/17159
Author:   andy_jefferson
Date:     2013-05-15 08:52:26 +0000 (Wed, 15 May 2013)
Log Message:
-----------
bump MANIFEST version, and remove unnecessary repository out of some POMs

Modified Paths:
--------------
    platform/api.jdo/trunk/META-INF/MANIFEST.MF
    platform/api.jdo/trunk/pom.xml
    platform/api.jpa/trunk/META-INF/MANIFEST.MF
    platform/api.jpa/trunk/pom.xml
    platform/api.rest/trunk/META-INF/MANIFEST.MF
    platform/api.rest/trunk/pom.xml

Modified: platform/api.jdo/trunk/META-INF/MANIFEST.MF
===================================================================
--- platform/api.jdo/trunk/META-INF/MANIFEST.MF	2013-05-15 08:48:29 UTC (rev 17158)
+++ platform/api.jdo/trunk/META-INF/MANIFEST.MF	2013-05-15 08:52:26 UTC (rev 17159)
@@ -3,7 +3,7 @@
 Bundle-Name: DataNucleus JDO API
 Bundle-SymbolicName: org.datanucleus.api.jdo;singleton:=true
 Bundle-Vendor: DataNucleus
-Bundle-Version: 3.2.2
+Bundle-Version: 3.2.3
 Require-Bundle: org.datanucleus;bundle-version="3.2.0.m4"
 Import-Package: javax.jdo;version="3.0.0",
  javax.jdo.annotations;version="3.0.0",
@@ -17,9 +17,9 @@
  javax.transaction;version="1.1.0";resolution:=optional,
  javax.transaction.xa;version="1.1.0";resolution:=optional,
  org.xml.sax;resolution:=optional
-Export-Package: org.datanucleus.api.jdo;version="3.2.2",
- org.datanucleus.api.jdo.exceptions;version="3.2.2",
- org.datanucleus.api.jdo.metadata;version="3.2.2",
- org.datanucleus.api.jdo.query;version="3.2.2",
- org.datanucleus.api.jdo.state;version="3.2.2",
- org.datanucleus.query.typesafe;version="3.2.2"
+Export-Package: org.datanucleus.api.jdo;version="3.2.3",
+ org.datanucleus.api.jdo.exceptions;version="3.2.3",
+ org.datanucleus.api.jdo.metadata;version="3.2.3",
+ org.datanucleus.api.jdo.query;version="3.2.3",
+ org.datanucleus.api.jdo.state;version="3.2.3",
+ org.datanucleus.query.typesafe;version="3.2.3"

Modified: platform/api.jdo/trunk/pom.xml
===================================================================
--- platform/api.jdo/trunk/pom.xml	2013-05-15 08:48:29 UTC (rev 17158)
+++ platform/api.jdo/trunk/pom.xml	2013-05-15 08:52:26 UTC (rev 17159)
@@ -40,15 +40,6 @@
         </developer>
     </developers>
 
-    <repositories>
-        <repository>
-            <id>DN_M2_Repo</id>
-            <url>http://www.datanucleus.org/downloads/maven2/</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
     <distributionManagement>
         <snapshotRepository>
             <id>datanucleus-nightly</id>
@@ -56,10 +47,6 @@
             <url>file:${user.home}/htdocs/downloads/maven2-nightly/</url>
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
-        <!--repository>
-            <id>datanucleus</id>
-            <url>scpexe://www.datanucleus.org//home/jpox/htdocs/downloads/maven2/</url>
-        </repository-->
     </distributionManagement>
 
     <dependencies>

Modified: platform/api.jpa/trunk/META-INF/MANIFEST.MF
===================================================================
--- platform/api.jpa/trunk/META-INF/MANIFEST.MF	2013-05-15 08:48:29 UTC (rev 17158)
+++ platform/api.jpa/trunk/META-INF/MANIFEST.MF	2013-05-15 08:52:26 UTC (rev 17159)
@@ -2,8 +2,8 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: DataNucleus JPA API
 Bundle-SymbolicName: org.datanucleus.api.jpa;singleton:=true
-Bundle-Version: 3.2.2
-Require-Bundle: org.datanucleus;bundle-version="3.2.2"
+Bundle-Version: 3.2.3
+Require-Bundle: org.datanucleus;bundle-version="3.2.3"
 Bundle-Vendor: DataNucleus
 Import-Package: javax.jdo;version="3.0.0",
  javax.jdo.annotations;version="3.0.0",
@@ -17,11 +17,11 @@
  javax.persistence.spi;version="2.0.0",
  org.osgi.service.blueprint;resolution:=optional;version="[1.0.0,2.0.0)",
  org.xml.sax;resolution:=optional
-Export-Package: javax.persistence.jpa21;version="3.2.2",
- org.datanucleus.api.jpa;version="3.2.2",
- org.datanucleus.api.jpa.annotations;version="3.2.2",
- org.datanucleus.api.jpa.criteria;version="3.2.2",
- org.datanucleus.api.jpa.exceptions;version="3.2.2",
- org.datanucleus.api.jpa.metadata;version="3.2.2",
- org.datanucleus.api.jpa.metamodel;version="3.2.2",
- org.datanucleus.api.jpa.state;version="3.2.2"
+Export-Package: javax.persistence.jpa21;version="3.2.3",
+ org.datanucleus.api.jpa;version="3.2.3",
+ org.datanucleus.api.jpa.annotations;version="3.2.3",
+ org.datanucleus.api.jpa.criteria;version="3.2.3",
+ org.datanucleus.api.jpa.exceptions;version="3.2.3",
+ org.datanucleus.api.jpa.metadata;version="3.2.3",
+ org.datanucleus.api.jpa.metamodel;version="3.2.3",
+ org.datanucleus.api.jpa.state;version="3.2.3"

Modified: platform/api.jpa/trunk/pom.xml
===================================================================
--- platform/api.jpa/trunk/pom.xml	2013-05-15 08:48:29 UTC (rev 17158)
+++ platform/api.jpa/trunk/pom.xml	2013-05-15 08:52:26 UTC (rev 17159)
@@ -40,15 +40,6 @@
         </developer>
     </developers>
 
-    <repositories>
-        <repository>
-            <id>DN_M2_Repo</id>
-            <url>http://www.datanucleus.org/downloads/maven2/</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
     <distributionManagement>
         <snapshotRepository>
             <id>datanucleus-nightly</id>
@@ -56,10 +47,6 @@
             <url>file:${user.home}/htdocs/downloads/maven2-nightly/</url>
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
-        <!--repository>
-            <id>datanucleus</id>
-            <url>scpexe://www.datanucleus.org//home/jpox/htdocs/downloads/maven2/</url>
-        </repository-->
     </distributionManagement>
 
     <dependencies>

Modified: platform/api.rest/trunk/META-INF/MANIFEST.MF
===================================================================
--- platform/api.rest/trunk/META-INF/MANIFEST.MF	2013-05-15 08:48:29 UTC (rev 17158)
+++ platform/api.rest/trunk/META-INF/MANIFEST.MF	2013-05-15 08:52:26 UTC (rev 17159)
@@ -2,13 +2,13 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: API REST
 Bundle-SymbolicName: org.datanucleus.api.rest
-Bundle-Version: 3.2.0.release
+Bundle-Version: 3.2.1
 Bundle-Vendor: DataNucleus
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.datanucleus;bundle-version="3.2.0.m1",
- org.datanucleus.api.jdo;bundle-version="3.2.0.m1"
+Require-Bundle: org.datanucleus;bundle-version="3.2.0.release",
+ org.datanucleus.api.jdo;bundle-version="3.2.0.release"
 Import-Package: javax.jdo;version="3.0.0",
  javax.jdo.spi;version="3.0.0",
  javax.servlet,
  javax.servlet.http
-Export-Package: org.datanucleus.api.rest;version="3.2.0.release"
+Export-Package: org.datanucleus.api.rest;version="3.2.1"

Modified: platform/api.rest/trunk/pom.xml
===================================================================
--- platform/api.rest/trunk/pom.xml	2013-05-15 08:48:29 UTC (rev 17158)
+++ platform/api.rest/trunk/pom.xml	2013-05-15 08:52:26 UTC (rev 17159)
@@ -11,7 +11,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.datanucleus</groupId>
     <artifactId>datanucleus-api-rest</artifactId>
-    <version>3.2.0-release</version>
+    <version>3.2.1-SNAPSHOT</version>
     <name>DataNucleus API REST plugin</name>
     <description>
         DataNucleus API RESTful HTTP Servlet plugin.
@@ -43,16 +43,6 @@
         </developer>
     </developers>
 
-    <repositories>
-        <repository>
-            <id>DN_M2_Repo</id>
-            <url>http://www.datanucleus.org/downloads/maven2/</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
     <distributionManagement>
         <snapshotRepository>
             <id>datanucleus-nightly</id>
@@ -60,10 +50,6 @@
             <url>file:${user.home}/htdocs/downloads/maven2-nightly/</url>
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
-        <!--repository>
-            <id>datanucleus</id>
-            <url>scpexe://www.datanucleus.org//home/jpox/htdocs/downloads/maven2/</url>
-        </repository-->
     </distributionManagement>
 
     <dependencies>

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

[DataNucleus-commits] SF.net SVN: datanucleus:[17165] platform

From: <andy_jefferson@us...> - 2013-05-17 18:34

Revision: 17165
          http://sourceforge.net/p/datanucleus/code/17165
Author:   andy_jefferson
Date:     2013-05-17 18:34:03 +0000 (Fri, 17 May 2013)
Log Message:
-----------
[NUCCORE-1042] Support datanucleus.metadata.xml.namespaceAware and default to true

Modified Paths:
--------------
    platform/accessplatform/trunk/build.properties
    platform/api.jdo/trunk/src/java/org/datanucleus/api/jdo/metadata/JDOMetaDataManager.java
    platform/api.jpa/trunk/src/java/org/datanucleus/api/jpa/metadata/JPAMetaDataHandler.java
    platform/api.jpa/trunk/src/java/org/datanucleus/api/jpa/metadata/JPAMetaDataManager.java
    platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java
    platform/core/trunk/src/java/org/datanucleus/PropertyNames.java
    platform/core/trunk/src/java/org/datanucleus/metadata/MetaDataManager.java
    platform/core/trunk/src/java/org/datanucleus/metadata/xml/MetaDataParser.java

Modified: platform/accessplatform/trunk/build.properties
===================================================================
--- platform/accessplatform/trunk/build.properties	2013-05-17 18:20:43 UTC (rev 17164)
+++ platform/accessplatform/trunk/build.properties	2013-05-17 18:34:03 UTC (rev 17165)
@@ -10,11 +10,11 @@
 
 datanucleus.group=org/datanucleus/
 
-datanucleus-core.version=3.2.3
+datanucleus-core.version=3.2.4-SNAPSHOT
 datanucleus-cache.version=3.1.1
 
-datanucleus-api-jdo.version=3.2.2
-datanucleus-api-jpa.version=3.2.2
+datanucleus-api-jdo.version=3.2.3-SNAPSHOT
+datanucleus-api-jpa.version=3.2.3-SNAPSHOT
 datanucleus-api-rest.version=3.2.0-release
 
 datanucleus-jpa-query.version=3.0.2

Modified: platform/api.jdo/trunk/src/java/org/datanucleus/api/jdo/metadata/JDOMetaDataManager.java
===================================================================
--- platform/api.jdo/trunk/src/java/org/datanucleus/api/jdo/metadata/JDOMetaDataManager.java	2013-05-17 18:20:43 UTC (rev 17164)
+++ platform/api.jdo/trunk/src/java/org/datanucleus/api/jdo/metadata/JDOMetaDataManager.java	2013-05-17 18:34:03 UTC (rev 17165)
@@ -236,6 +236,7 @@
         {
             metaDataParser = new MetaDataParser(this, nucleusContext.getPluginManager(), validateXML);
         }
+        metaDataParser.setNamespaceAware(supportXMLNamespaces);
         return (FileMetaData)metaDataParser.parseMetaDataURL(fileURL, "jdo");
     }
 

Modified: platform/api.jpa/trunk/src/java/org/datanucleus/api/jpa/metadata/JPAMetaDataHandler.java
===================================================================
--- platform/api.jpa/trunk/src/java/org/datanucleus/api/jpa/metadata/JPAMetaDataHandler.java	2013-05-17 18:20:43 UTC (rev 17164)
+++ platform/api.jpa/trunk/src/java/org/datanucleus/api/jpa/metadata/JPAMetaDataHandler.java	2013-05-17 18:34:03 UTC (rev 17165)
@@ -452,7 +452,8 @@
     public void startElement(String uri, String localName, String qName, Attributes attrs)
     throws SAXException
     {
-        if (localName.length()<1)
+        NucleusLogger.GENERAL.info(">> localName=" + localName + " qName=" + qName + " uri=" + uri);
+        if (localName.length() < 1)
         {
             localName = qName;
         }
@@ -791,6 +792,7 @@
                 // New entity for this package
                 FileMetaData filemd = (FileMetaData)getStack();
                 String className = getAttr(attrs, "class");
+                NucleusLogger.GENERAL.info(">> JPAMDH <entity> class=" + className);
                 String packageName = null;
                 if (className.indexOf('.') > 0)
                 {

Modified: platform/api.jpa/trunk/src/java/org/datanucleus/api/jpa/metadata/JPAMetaDataManager.java
===================================================================
--- platform/api.jpa/trunk/src/java/org/datanucleus/api/jpa/metadata/JPAMetaDataManager.java	2013-05-17 18:20:43 UTC (rev 17164)
+++ platform/api.jpa/trunk/src/java/org/datanucleus/api/jpa/metadata/JPAMetaDataManager.java	2013-05-17 18:34:03 UTC (rev 17165)
@@ -106,6 +106,7 @@
         {
             metaDataParser = new MetaDataParser(this, nucleusContext.getPluginManager(), validateXML);
         }
+        metaDataParser.setNamespaceAware(supportXMLNamespaces);
         return (FileMetaData)metaDataParser.parseMetaDataURL(fileURL, "jpa");
     }
 

Modified: platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java	2013-05-17 18:20:43 UTC (rev 17164)
+++ platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java	2013-05-17 18:34:03 UTC (rev 17165)
@@ -157,6 +157,7 @@
         // MetaData
         addDefaultBooleanProperty(PropertyNames.PROPERTY_METADATA_ALWAYS_DETACHABLE, null, false, false, false);
         addDefaultBooleanProperty(PropertyNames.PROPERTY_METADATA_VALIDATE, null, false, false, false);
+        addDefaultBooleanProperty(PropertyNames.PROPERTY_METADATA_XML_NAMESPACE_AWARE, null, true, false, false);
         addDefaultBooleanProperty(PropertyNames.PROPERTY_METADATA_AUTOREGISTER, null, true, false, false);
         addDefaultBooleanProperty(PropertyNames.PROPERTY_METADATA_ALLOW_XML, null, true, false, false);
         addDefaultBooleanProperty(PropertyNames.PROPERTY_METADATA_ALLOW_ANNOTATIONS, null, true, false, false);

Modified: platform/core/trunk/src/java/org/datanucleus/PropertyNames.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/PropertyNames.java	2013-05-17 18:20:43 UTC (rev 17164)
+++ platform/core/trunk/src/java/org/datanucleus/PropertyNames.java	2013-05-17 18:34:03 UTC (rev 17165)
@@ -78,6 +78,7 @@
 
     public static final String PROPERTY_METADATA_ALWAYS_DETACHABLE = "datanucleus.metadata.alwaysDetachable";
     public static final String PROPERTY_METADATA_VALIDATE = "datanucleus.metadata.validate";
+    public static final String PROPERTY_METADATA_XML_NAMESPACE_AWARE = "datanucleus.metadata.xml.namespaceAware";
     public static final String PROPERTY_METADATA_AUTOREGISTER = "datanucleus.metadata.autoregistration";
     public static final String PROPERTY_METADATA_ALLOW_XML = "datanucleus.metadata.allowXML";
     public static final String PROPERTY_METADATA_ALLOW_ANNOTATIONS = "datanucleus.metadata.allowAnnotations";

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/MetaDataManager.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/MetaDataManager.java	2013-05-17 18:20:43 UTC (rev 17164)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/MetaDataManager.java	2013-05-17 18:34:03 UTC (rev 17165)
@@ -35,6 +35,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Properties;
 import java.util.Set;
 import java.util.TreeSet;
 
@@ -109,6 +110,9 @@
     /** Flag whether we should validate the (XML) metadata files when parsing. */
     protected boolean validateXML = true;
 
+    /** Flag whether we should be (XML) namespace aware when parsing. */
+    protected boolean supportXMLNamespaces = true;
+
     /** Cache of class names that are known to not have MetaData/annotations. */
     protected Collection<String> classesWithoutPersistenceInfo = new HashSet();
 
@@ -203,6 +207,7 @@
         nucleusContext = ctx;
 
         validateXML = nucleusContext.getPersistenceConfiguration().getBooleanProperty(PropertyNames.PROPERTY_METADATA_VALIDATE);
+        supportXMLNamespaces = nucleusContext.getPersistenceConfiguration().getBooleanProperty(PropertyNames.PROPERTY_METADATA_XML_NAMESPACE_AWARE);
         allowXML = nucleusContext.getPersistenceConfiguration().getBooleanProperty(PropertyNames.PROPERTY_METADATA_ALLOW_XML);
         allowAnnotations = nucleusContext.getPersistenceConfiguration().getBooleanProperty(PropertyNames.PROPERTY_METADATA_ALLOW_ANNOTATIONS);
 
@@ -410,6 +415,15 @@
     }
 
     /**
+     * Mutator for whether to support XML namespaces.
+     * @param aware Whether to be XML namespace aware
+     */
+    public void setXmlNamespaceAware(boolean aware)
+    {
+        supportXMLNamespaces = aware;
+    }
+
+    /**
      * Accessor for the NucleusContext that this manager is running in.
      * @return The NucleusContext
      */
@@ -745,6 +759,27 @@
         {
             return null;
         }
+        Properties puProps = pumd.getProperties();
+        if (puProps != null)
+        {
+            // Apply any properties from this persistence unit to the metadata manager
+            if (puProps.containsKey(PropertyNames.PROPERTY_METADATA_VALIDATE))
+            {
+                Boolean val = Boolean.valueOf((String) puProps.get(PropertyNames.PROPERTY_METADATA_VALIDATE));
+                if (val != null)
+                {
+                    validateXML = val;
+                }
+            }
+            if (puProps.containsKey(PropertyNames.PROPERTY_METADATA_XML_NAMESPACE_AWARE))
+            {
+                Boolean val = Boolean.valueOf((String) puProps.get(PropertyNames.PROPERTY_METADATA_XML_NAMESPACE_AWARE));
+                if (val != null)
+                {
+                    supportXMLNamespaces = val;
+                }
+            }
+        }
 
         if (NucleusLogger.METADATA.isDebugEnabled())
         {

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/xml/MetaDataParser.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/xml/MetaDataParser.java	2013-05-17 18:20:43 UTC (rev 17164)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/xml/MetaDataParser.java	2013-05-17 18:34:03 UTC (rev 17165)
@@ -98,6 +98,10 @@
 
     public void setNamespaceAware(boolean aware)
     {
+        if (namespaceAware != aware)
+        {
+            parser = null;
+        }
         this.namespaceAware = aware;
     }
 

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

[DataNucleus-commits] SF.net SVN: datanucleus:[17167] platform

From: <andy_jefferson@us...> - 2013-05-18 09:01

Revision: 17167
          http://sourceforge.net/p/datanucleus/code/17167
Author:   andy_jefferson
Date:     2013-05-18 09:01:07 +0000 (Sat, 18 May 2013)
Log Message:
-----------
[NUCCORE-1043] Rename of property, and allow old value for a while (deprecated)

Modified Paths:
--------------
    documentation/accessplatform/trunk/src/site/xdoc/migration.xml
    documentation/accessplatform/trunk/src/site/xdoc/persistence_properties.xml
    platform/api.jdo/trunk/src/java/org/datanucleus/api/jdo/JDOPersistenceManagerFactory.java
    platform/api.jpa/trunk/src/java/org/datanucleus/api/jpa/JPAEntityManagerFactory.java
    platform/api.jpa/trunk/src/java/org/datanucleus/api/jpa/PersistenceProviderImpl.java
    platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java
    platform/core/trunk/src/java/org/datanucleus/PropertyNames.java
    platform/core/trunk/src/java/org/datanucleus/metadata/MetaDataManager.java

Modified: documentation/accessplatform/trunk/src/site/xdoc/migration.xml
===================================================================
--- documentation/accessplatform/trunk/src/site/xdoc/migration.xml	2013-05-17 18:36:24 UTC (rev 17166)
+++ documentation/accessplatform/trunk/src/site/xdoc/migration.xml	2013-05-18 09:01:07 UTC (rev 17167)
@@ -18,6 +18,26 @@
                 changes to move between versions of DataNucleus. We aim to keep this to a minimum.
             </p>
 
+            <a name="3_2_3_FROM_3_2_2"/>
+            <subsection name="Migration from 3.2.2 to 3.2.3">
+                <p>
+                    Migrating from AccessPlatform 3.2.2 to 3.2.3 will require the following changes
+                </p>
+                <ul>
+                    <li>The persistence property <i>datanucleus.metadata.validate</i> is renamed to
+                        <b>datanucleus.metadata.xml.validate</b> to better describe its usage. The original
+                        name is still supported but you are advised to move to this new naming as the old one
+                        can be removed in a future release.</li>
+                </ul>
+            </subsection>
+
+            <a name="3_2_2_FROM_3_2_1"/>
+            <subsection name="Migration from 3.2.1 to 3.2.2">
+                <p>
+                    Migrating from AccessPlatform 3.2.1 to 3.2.2 will require no changes.
+                </p>
+            </subsection>
+
             <a name="3_2_1_FROM_3_2_0_REL"/>
             <subsection name="Migration from 3.2.0.RELEASE to 3.2.1">
                 <p>

Modified: documentation/accessplatform/trunk/src/site/xdoc/persistence_properties.xml
===================================================================
--- documentation/accessplatform/trunk/src/site/xdoc/persistence_properties.xml	2013-05-17 18:36:24 UTC (rev 17166)
+++ documentation/accessplatform/trunk/src/site/xdoc/persistence_properties.xml	2013-05-18 09:01:07 UTC (rev 17167)
@@ -2479,16 +2479,18 @@
                 <table>
                     <tr>
                         <th colspan="2">
-                            <b>datanucleus.metadata.validate</b>
+                            <b>datanucleus.metadata.xml.validate</b>
                         </th>
                     </tr>
                     <tr>
                         <td width="120">Description</td>
-                        <td>Whether to validate the MetaData file(s) for XML correctness (against the DTD) when parsing</td>
+                        <td>Whether to validate the MetaData file(s) for XML correctness (against the DTD) when parsing.
+                            Note that this was originally called <i>datanucleus.metadata.validate</i> but is
+                            renamed in v3.2.3</td>
                     </tr>
                     <tr>
                         <td>Range of values</td>
-                        <td><b>true</b> | false</td>
+                        <td>true | <b>false</b></td>
                     </tr>
                 </table>
                 <br/>

Modified: platform/api.jdo/trunk/src/java/org/datanucleus/api/jdo/JDOPersistenceManagerFactory.java
===================================================================
--- platform/api.jdo/trunk/src/java/org/datanucleus/api/jdo/JDOPersistenceManagerFactory.java	2013-05-17 18:36:24 UTC (rev 17166)
+++ platform/api.jdo/trunk/src/java/org/datanucleus/api/jdo/JDOPersistenceManagerFactory.java	2013-05-18 09:01:07 UTC (rev 17167)
@@ -698,7 +698,7 @@
         nucleusContext.getMetaDataManager().setAllowAnnotations(
             getConfiguration().getBooleanProperty(PropertyNames.PROPERTY_METADATA_ALLOW_ANNOTATIONS));
         nucleusContext.getMetaDataManager().setValidate(
-            getConfiguration().getBooleanProperty(PropertyNames.PROPERTY_METADATA_VALIDATE));
+            getConfiguration().getBooleanProperty(PropertyNames.PROPERTY_METADATA_XML_VALIDATE));
 
         if (pumd != null)
         {

Modified: platform/api.jpa/trunk/src/java/org/datanucleus/api/jpa/JPAEntityManagerFactory.java
===================================================================
--- platform/api.jpa/trunk/src/java/org/datanucleus/api/jpa/JPAEntityManagerFactory.java	2013-05-17 18:36:24 UTC (rev 17166)
+++ platform/api.jpa/trunk/src/java/org/datanucleus/api/jpa/JPAEntityManagerFactory.java	2013-05-18 09:01:07 UTC (rev 17167)
@@ -364,9 +364,9 @@
                 {
                     persistenceFileName = (String)overridingProps.get(PropertyNames.PROPERTY_PERSISTENCE_XML_FILENAME);
                 }
-                if (overridingProps.containsKey(PropertyNames.PROPERTY_METADATA_VALIDATE))
+                if (overridingProps.containsKey(PropertyNames.PROPERTY_METADATA_XML_VALIDATE))
                 {
-                    validate = Boolean.getBoolean((String)overridingProps.get(PropertyNames.PROPERTY_METADATA_VALIDATE));
+                    validate = Boolean.getBoolean((String)overridingProps.get(PropertyNames.PROPERTY_METADATA_XML_VALIDATE));
                 }
             }
             PersistenceFileMetaData[] files = MetaDataUtils.parsePersistenceFiles(pluginMgr, persistenceFileName, 
@@ -851,7 +851,7 @@
         // Initialise metadata manager, and load up the MetaData implied by this "persistence-unit"
         nucleusCtx.getMetaDataManager().setAllowXML(propConfig.getBooleanProperty(PropertyNames.PROPERTY_METADATA_ALLOW_XML));
         nucleusCtx.getMetaDataManager().setAllowAnnotations(propConfig.getBooleanProperty(PropertyNames.PROPERTY_METADATA_ALLOW_ANNOTATIONS));
-        nucleusCtx.getMetaDataManager().setValidate(propConfig.getBooleanProperty(PropertyNames.PROPERTY_METADATA_VALIDATE));
+        nucleusCtx.getMetaDataManager().setValidate(propConfig.getBooleanProperty(PropertyNames.PROPERTY_METADATA_XML_VALIDATE));
         nucleusCtx.getMetaDataManager().loadPersistenceUnit(unitMetaData, null);
 
         // Initialise the context, creating the StoreManager

Modified: platform/api.jpa/trunk/src/java/org/datanucleus/api/jpa/PersistenceProviderImpl.java
===================================================================
--- platform/api.jpa/trunk/src/java/org/datanucleus/api/jpa/PersistenceProviderImpl.java	2013-05-17 18:36:24 UTC (rev 17166)
+++ platform/api.jpa/trunk/src/java/org/datanucleus/api/jpa/PersistenceProviderImpl.java	2013-05-18 09:01:07 UTC (rev 17167)
@@ -409,9 +409,9 @@
             {
                 persistenceFileName = (String)overridingProps.get(PropertyNames.PROPERTY_PERSISTENCE_XML_FILENAME);
             }
-            if (overridingProps.containsKey(PropertyNames.PROPERTY_METADATA_VALIDATE))
+            if (overridingProps.containsKey(PropertyNames.PROPERTY_METADATA_XML_VALIDATE))
             {
-                validate = Boolean.getBoolean((String)overridingProps.get(PropertyNames.PROPERTY_METADATA_VALIDATE));
+                validate = Boolean.getBoolean((String)overridingProps.get(PropertyNames.PROPERTY_METADATA_XML_VALIDATE));
             }
         }
 

Modified: platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java	2013-05-17 18:36:24 UTC (rev 17166)
+++ platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java	2013-05-18 09:01:07 UTC (rev 17167)
@@ -156,7 +156,9 @@
 
         // MetaData
         addDefaultBooleanProperty(PropertyNames.PROPERTY_METADATA_ALWAYS_DETACHABLE, null, false, false, false);
-        addDefaultBooleanProperty(PropertyNames.PROPERTY_METADATA_VALIDATE, null, false, false, false);
+        addDefaultBooleanProperty(PropertyNames.PROPERTY_METADATA_XML_VALIDATE, null, false, false, false);
+        // TODO Deprecated so remove in future release
+        addDefaultBooleanProperty("datanucleus.metadata.validate", PropertyNames.PROPERTY_METADATA_XML_VALIDATE, false, false, false);
         addDefaultBooleanProperty(PropertyNames.PROPERTY_METADATA_XML_NAMESPACE_AWARE, null, true, false, false);
         addDefaultBooleanProperty(PropertyNames.PROPERTY_METADATA_AUTOREGISTER, null, true, false, false);
         addDefaultBooleanProperty(PropertyNames.PROPERTY_METADATA_ALLOW_XML, null, true, false, false);

Modified: platform/core/trunk/src/java/org/datanucleus/PropertyNames.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/PropertyNames.java	2013-05-17 18:36:24 UTC (rev 17166)
+++ platform/core/trunk/src/java/org/datanucleus/PropertyNames.java	2013-05-18 09:01:07 UTC (rev 17167)
@@ -77,7 +77,7 @@
     public static final String PROPERTY_FLUSH_AUTO_OBJECT_LIMIT = "datanucleus.datastoreTransactionFlushLimit";
 
     public static final String PROPERTY_METADATA_ALWAYS_DETACHABLE = "datanucleus.metadata.alwaysDetachable";
-    public static final String PROPERTY_METADATA_VALIDATE = "datanucleus.metadata.validate";
+    public static final String PROPERTY_METADATA_XML_VALIDATE = "datanucleus.metadata.xml.validate";
     public static final String PROPERTY_METADATA_XML_NAMESPACE_AWARE = "datanucleus.metadata.xml.namespaceAware";
     public static final String PROPERTY_METADATA_AUTOREGISTER = "datanucleus.metadata.autoregistration";
     public static final String PROPERTY_METADATA_ALLOW_XML = "datanucleus.metadata.allowXML";

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/MetaDataManager.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/MetaDataManager.java	2013-05-17 18:36:24 UTC (rev 17166)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/MetaDataManager.java	2013-05-18 09:01:07 UTC (rev 17167)
@@ -206,7 +206,7 @@
     {
         nucleusContext = ctx;
 
-        validateXML = nucleusContext.getPersistenceConfiguration().getBooleanProperty(PropertyNames.PROPERTY_METADATA_VALIDATE);
+        validateXML = nucleusContext.getPersistenceConfiguration().getBooleanProperty(PropertyNames.PROPERTY_METADATA_XML_VALIDATE);
         supportXMLNamespaces = nucleusContext.getPersistenceConfiguration().getBooleanProperty(PropertyNames.PROPERTY_METADATA_XML_NAMESPACE_AWARE);
         allowXML = nucleusContext.getPersistenceConfiguration().getBooleanProperty(PropertyNames.PROPERTY_METADATA_ALLOW_XML);
         allowAnnotations = nucleusContext.getPersistenceConfiguration().getBooleanProperty(PropertyNames.PROPERTY_METADATA_ALLOW_ANNOTATIONS);
@@ -763,9 +763,9 @@
         if (puProps != null)
         {
             // Apply any properties from this persistence unit to the metadata manager
-            if (puProps.containsKey(PropertyNames.PROPERTY_METADATA_VALIDATE))
+            if (puProps.containsKey(PropertyNames.PROPERTY_METADATA_XML_VALIDATE))
             {
-                Boolean val = Boolean.valueOf((String) puProps.get(PropertyNames.PROPERTY_METADATA_VALIDATE));
+                Boolean val = Boolean.valueOf((String) puProps.get(PropertyNames.PROPERTY_METADATA_XML_VALIDATE));
                 if (val != null)
                 {
                     validateXML = val;

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

[DataNucleus-commits] SF.net SVN: datanucleus:[17172] platform

From: <andy_jefferson@us...> - 2013-05-22 18:01

Revision: 17172
          http://sourceforge.net/p/datanucleus/code/17172
Author:   andy_jefferson
Date:     2013-05-22 18:01:25 +0000 (Wed, 22 May 2013)
Log Message:
-----------
[NUCCORE-1044] Change MapRemoveOperation to hold the key and value, and pass the value through to the backing store if known

Modified Paths:
--------------
    platform/accessplatform/trunk/build.properties
    platform/core/trunk/src/java/org/datanucleus/flush/MapRemoveOperation.java
    platform/core/trunk/src/java/org/datanucleus/store/scostore/MapStore.java
    platform/core/trunk/src/java/org/datanucleus/store/types/backed/HashMap.java
    platform/core/trunk/src/java/org/datanucleus/store/types/backed/Hashtable.java
    platform/core/trunk/src/java/org/datanucleus/store/types/backed/LinkedHashMap.java
    platform/core/trunk/src/java/org/datanucleus/store/types/backed/Map.java
    platform/core/trunk/src/java/org/datanucleus/store/types/backed/Properties.java
    platform/core/trunk/src/java/org/datanucleus/store/types/backed/SortedMap.java
    platform/core/trunk/src/java/org/datanucleus/store/types/backed/TreeMap.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/FKMapStore.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/JoinMapStore.java

Modified: platform/accessplatform/trunk/build.properties
===================================================================
--- platform/accessplatform/trunk/build.properties	2013-05-22 16:22:37 UTC (rev 17171)
+++ platform/accessplatform/trunk/build.properties	2013-05-22 18:01:25 UTC (rev 17172)
@@ -20,7 +20,7 @@
 datanucleus-jpa-query.version=3.0.2
 datanucleus-jdo-query.version=3.0.2
 
-datanucleus-rdbms.version=3.2.2
+datanucleus-rdbms.version=3.2.3-SNAPSHOT
 datanucleus-mongodb.version=3.2.1
 datanucleus-hbase.version=3.2.1
 datanucleus-neo4j.version=3.2.1

Modified: platform/core/trunk/src/java/org/datanucleus/flush/MapRemoveOperation.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/flush/MapRemoveOperation.java	2013-05-22 16:22:37 UTC (rev 17171)
+++ platform/core/trunk/src/java/org/datanucleus/flush/MapRemoveOperation.java	2013-05-22 18:01:25 UTC (rev 17172)
@@ -32,11 +32,15 @@
     /** The key to remove. */
     private final Object key;
 
-    public MapRemoveOperation(ObjectProvider op, MapStore store, Object key)
+    /** The value to remove. */
+    private final Object value;
+
+    public MapRemoveOperation(ObjectProvider op, MapStore store, Object key, Object val)
     {
         this.op = op;
         this.store = store;
         this.key = key;
+        this.value = val;
     }
 
     /**
@@ -49,11 +53,27 @@
     }
 
     /**
+     * Accessor for the value being removed for this key (if known).
+     * @return Value being removed if known
+     */
+    public Object getValue()
+    {
+        return value;
+    }
+
+    /**
      * Perform the remove(Object) operation on the specified container.
      */
     public void perform()
     {
-        store.remove(op, key);
+        if (value != null)
+        {
+            store.remove(op, key, value);
+        }
+        else
+        {
+            store.remove(op, key);
+        }
     }
 
     public Store getStore()

Modified: platform/core/trunk/src/java/org/datanucleus/store/scostore/MapStore.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/scostore/MapStore.java	2013-05-22 16:22:37 UTC (rev 17171)
+++ platform/core/trunk/src/java/org/datanucleus/store/scostore/MapStore.java	2013-05-22 18:01:25 UTC (rev 17172)
@@ -103,6 +103,15 @@
     Object remove(ObjectProvider op, Object key);
 
     /**
+     * Method to remove a value from the Map.
+     * @param op ObjectProvider for the owner of the map. 
+     * @param key Key whose value is to be removed.
+     * @param val Value for this key when the value is known (to save the lookup)
+     * @return Value that was removed.
+     */
+    Object remove(ObjectProvider op, Object key, Object val);
+
+    /**
      * Method to clear the map.
      * @param op ObjectProvider for the owner of the map. 
      */

Modified: platform/core/trunk/src/java/org/datanucleus/store/types/backed/HashMap.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/types/backed/HashMap.java	2013-05-22 16:22:37 UTC (rev 17171)
+++ platform/core/trunk/src/java/org/datanucleus/store/types/backed/HashMap.java	2013-05-22 18:01:25 UTC (rev 17172)
@@ -687,7 +687,7 @@
         {
             if (SCOUtils.useQueuedUpdate(queued, ownerOP))
             {
-                ownerOP.getExecutionContext().addOperationToQueue(new MapRemoveOperation(ownerOP, backingStore, key));
+                ownerOP.getExecutionContext().addOperationToQueue(new MapRemoveOperation(ownerOP, backingStore, key, delegateRemoved));
                 removed = delegateRemoved;
             }
             else

Modified: platform/core/trunk/src/java/org/datanucleus/store/types/backed/Hashtable.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/types/backed/Hashtable.java	2013-05-22 16:22:37 UTC (rev 17171)
+++ platform/core/trunk/src/java/org/datanucleus/store/types/backed/Hashtable.java	2013-05-22 18:01:25 UTC (rev 17172)
@@ -682,7 +682,7 @@
         {
             if (SCOUtils.useQueuedUpdate(queued, ownerOP))
             {
-                ownerOP.getExecutionContext().addOperationToQueue(new MapRemoveOperation(ownerOP, backingStore, key));
+                ownerOP.getExecutionContext().addOperationToQueue(new MapRemoveOperation(ownerOP, backingStore, key, delegateRemoved));
                 removed = delegateRemoved;
             }
             else

Modified: platform/core/trunk/src/java/org/datanucleus/store/types/backed/LinkedHashMap.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/types/backed/LinkedHashMap.java	2013-05-22 16:22:37 UTC (rev 17171)
+++ platform/core/trunk/src/java/org/datanucleus/store/types/backed/LinkedHashMap.java	2013-05-22 18:01:25 UTC (rev 17172)
@@ -686,7 +686,7 @@
         {
             if (SCOUtils.useQueuedUpdate(queued, ownerOP))
             {
-                ownerOP.getExecutionContext().addOperationToQueue(new MapRemoveOperation(ownerOP, backingStore, key));
+                ownerOP.getExecutionContext().addOperationToQueue(new MapRemoveOperation(ownerOP, backingStore, key, delegateRemoved));
                 removed = delegateRemoved;
             }
             else

Modified: platform/core/trunk/src/java/org/datanucleus/store/types/backed/Map.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/types/backed/Map.java	2013-05-22 16:22:37 UTC (rev 17171)
+++ platform/core/trunk/src/java/org/datanucleus/store/types/backed/Map.java	2013-05-22 18:01:25 UTC (rev 17172)
@@ -745,7 +745,7 @@
         {
             if (SCOUtils.useQueuedUpdate(queued, ownerOP))
             {
-                ownerOP.getExecutionContext().addOperationToQueue(new MapRemoveOperation(ownerOP, backingStore, key));
+                ownerOP.getExecutionContext().addOperationToQueue(new MapRemoveOperation(ownerOP, backingStore, key, delegateRemoved));
                 removed = delegateRemoved;
             }
             else

Modified: platform/core/trunk/src/java/org/datanucleus/store/types/backed/Properties.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/types/backed/Properties.java	2013-05-22 16:22:37 UTC (rev 17171)
+++ platform/core/trunk/src/java/org/datanucleus/store/types/backed/Properties.java	2013-05-22 18:01:25 UTC (rev 17172)
@@ -708,7 +708,7 @@
         {
             if (SCOUtils.useQueuedUpdate(queued, ownerOP))
             {
-                ownerOP.getExecutionContext().addOperationToQueue(new MapRemoveOperation(ownerOP, backingStore, key));
+                ownerOP.getExecutionContext().addOperationToQueue(new MapRemoveOperation(ownerOP, backingStore, key, delegateRemoved));
                 removed = delegateRemoved;
             }
             else

Modified: platform/core/trunk/src/java/org/datanucleus/store/types/backed/SortedMap.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/types/backed/SortedMap.java	2013-05-22 16:22:37 UTC (rev 17171)
+++ platform/core/trunk/src/java/org/datanucleus/store/types/backed/SortedMap.java	2013-05-22 18:01:25 UTC (rev 17172)
@@ -839,7 +839,7 @@
         {
             if (SCOUtils.useQueuedUpdate(queued, ownerOP))
             {
-                ownerOP.getExecutionContext().addOperationToQueue(new MapRemoveOperation(ownerOP, backingStore, key));
+                ownerOP.getExecutionContext().addOperationToQueue(new MapRemoveOperation(ownerOP, backingStore, key, delegateRemoved));
                 removed = delegateRemoved;
             }
             else

Modified: platform/core/trunk/src/java/org/datanucleus/store/types/backed/TreeMap.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/types/backed/TreeMap.java	2013-05-22 16:22:37 UTC (rev 17171)
+++ platform/core/trunk/src/java/org/datanucleus/store/types/backed/TreeMap.java	2013-05-22 18:01:25 UTC (rev 17172)
@@ -840,7 +840,7 @@
         {
             if (SCOUtils.useQueuedUpdate(queued, ownerOP))
             {
-                ownerOP.getExecutionContext().addOperationToQueue(new MapRemoveOperation(ownerOP, backingStore, key));
+                ownerOP.getExecutionContext().addOperationToQueue(new MapRemoveOperation(ownerOP, backingStore, key, delegateRemoved));
                 removed = delegateRemoved;
             }
             else

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/FKMapStore.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/FKMapStore.java	2013-05-22 16:22:37 UTC (rev 17171)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/FKMapStore.java	2013-05-22 18:01:25 UTC (rev 17172)
@@ -669,7 +669,17 @@
     public Object remove(ObjectProvider op, Object key)
     {
         Object oldValue = get(op, key);
+        return remove(op, key, oldValue);
+    }
 
+    /**
+     * Method to remove an entry from the map.
+     * @param op ObjectProvider for the map.
+     * @param key Key of the entry to remove.
+     * @return The value that was removed.
+     */
+    public Object remove(ObjectProvider op, Object key, Object oldValue)
+    {
         ExecutionContext ec = op.getExecutionContext();
         if (keyFieldNumber >= 0)
         {

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/JoinMapStore.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/JoinMapStore.java	2013-05-22 16:22:37 UTC (rev 17171)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/JoinMapStore.java	2013-05-22 18:01:25 UTC (rev 17172)
@@ -333,11 +333,11 @@
     }
 
     /**
-     * Method to remove an item from the map.
+     * Method to remove an entry from the map.
      * @param op ObjectProvider for the map.
-     * @param key Key of the item to remove.
+     * @param key Key of the entry to remove.
      * @return The value that was removed.
-     **/
+     */
     public Object remove(ObjectProvider op, Object key)
     {
         if (!validateKeyForReading(op, key))
@@ -385,6 +385,42 @@
     }
 
     /**
+     * Method to remove an item from the map.
+     * @param op ObjectProvider for the map.
+     * @param key Key of the item to remove.
+     * @return The value that was removed.
+     */
+    public Object remove(ObjectProvider op, Object key, Object oldValue)
+    {
+        if (!validateKeyForReading(op, key))
+        {
+            return null;
+        }
+
+        ExecutionContext ec = op.getExecutionContext();
+        removeInternal(op, key);
+
+        MapMetaData mapmd = ownerMemberMetaData.getMap();
+        ApiAdapter api = ec.getApiAdapter();
+        if (mapmd.isDependentKey() && !mapmd.isEmbeddedKey() && api.isPersistable(key))
+        {
+            // Delete the key if it is dependent
+            ec.deleteObjectInternal(key);
+        }
+
+        if (mapmd.isDependentValue() && !mapmd.isEmbeddedValue() && api.isPersistable(oldValue))
+        {
+            if (!containsValue(op, oldValue))
+            {
+                // Delete the value if it is dependent and is not keyed by another key
+                ec.deleteObjectInternal(oldValue);
+            }
+        }
+
+        return oldValue;
+    }
+
+    /**
      * Method to clear the map of all values.
      * @param ownerSM ObjectProvider for the map.
      */

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

[DataNucleus-commits] SF.net SVN: datanucleus:[17242] platform

From: <andy_jefferson@us...> - 2013-05-28 14:56

Revision: 17242
          http://sourceforge.net/p/datanucleus/code/17242
Author:   andy_jefferson
Date:     2013-05-28 14:56:14 +0000 (Tue, 28 May 2013)
Log Message:
-----------
[NUCCACHE-36] Bump to current version of spymemcached and cater for hashing of "id" component of key

Modified Paths:
--------------
    platform/cache/trunk/META-INF/MANIFEST.MF
    platform/cache/trunk/pom.xml
    platform/cache/trunk/src/java/org/datanucleus/cache/spymemcached/SpymemcachedLevel2Cache.java
    platform/local.repository/trunk/.classpath
    platform/local.repository/trunk/META-INF/MANIFEST.MF

Added Paths:
-----------
    platform/local.repository/trunk/net.spy/
    platform/local.repository/trunk/net.spy/jars/
    platform/local.repository/trunk/net.spy/jars/spymemcached-2.8.12.jar

Removed Paths:
-------------
    platform/local.repository/trunk/net.spy.memcached/

Modified: platform/cache/trunk/META-INF/MANIFEST.MF
===================================================================
--- platform/cache/trunk/META-INF/MANIFEST.MF	2013-05-28 11:03:55 UTC (rev 17241)
+++ platform/cache/trunk/META-INF/MANIFEST.MF	2013-05-28 14:56:14 UTC (rev 17242)
@@ -28,11 +28,11 @@
  net.sf.ehcache.store;resolution:=optional,
  net.sf.jsr107cache;resolution:=optional,
  net.sf.swarmcache;resolution:=optional,
- net.spy.memcached;resolution:=optional,
- net.spy.memcached.compat;resolution:=optional,
- net.spy.memcached.compat.log;resolution:=optional,
- net.spy.memcached.ops;resolution:=optional,
- net.spy.memcached.protocol;resolution:=optional,
- net.spy.memcached.protocol.ascii;resolution:=optional,
- net.spy.memcached.protocol.binary;resolution:=optional,
- net.spy.memcached.transcoders;resolution:=optional
+ net.spy.memcached;version="2.0.0";resolution:=optional,
+ net.spy.memcached.compat;version="2.0.0";resolution:=optional,
+ net.spy.memcached.compat.log;version="2.0.0";resolution:=optional,
+ net.spy.memcached.ops;version="2.0.0";resolution:=optional,
+ net.spy.memcached.protocol;version="2.0.0";resolution:=optional,
+ net.spy.memcached.protocol.ascii;version="2.0.0";resolution:=optional,
+ net.spy.memcached.protocol.binary;version="2.0.0";resolution:=optional,
+ net.spy.memcached.transcoders;version="2.0.0";resolution:=optional

Modified: platform/cache/trunk/pom.xml
===================================================================
--- platform/cache/trunk/pom.xml	2013-05-28 11:03:55 UTC (rev 17241)
+++ platform/cache/trunk/pom.xml	2013-05-28 14:56:14 UTC (rev 17242)
@@ -34,6 +34,14 @@
 
     <repositories>
         <repository>
+            <id>Spymemcached_Repo</id>
+            <url>http://files.couchbase.com/maven2/</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+
+        <repository>
             <id>DN_M2_Repo</id>
             <url>http://www.datanucleus.org/downloads/maven2/</url>
             <snapshots>
@@ -62,7 +70,7 @@
         <dependency>
             <groupId>spy</groupId>
             <artifactId>spymemcached</artifactId>
-            <version>2.6</version>
+            <version>[2.3, 3.0)</version>
             <optional>true</optional>
         </dependency>
         <dependency>

Modified: platform/cache/trunk/src/java/org/datanucleus/cache/spymemcached/SpymemcachedLevel2Cache.java
===================================================================
--- platform/cache/trunk/src/java/org/datanucleus/cache/spymemcached/SpymemcachedLevel2Cache.java	2013-05-28 11:03:55 UTC (rev 17241)
+++ platform/cache/trunk/src/java/org/datanucleus/cache/spymemcached/SpymemcachedLevel2Cache.java	2013-05-28 14:56:14 UTC (rev 17242)
@@ -13,6 +13,7 @@
 limitations under the License.
 
 Contributors:
+2013 Andy Jefferson - cater for hashing of ids
     ...
 **********************************************************************/
 package org.datanucleus.cache.spymemcached;
@@ -84,7 +85,7 @@
 
     public synchronized void evict(Object oid)
     {
-        client.delete(cacheName + getCacheKeyForId(oid));
+        client.delete(getCacheKeyForId(oid));
     }
 
     public synchronized void evictAll()
@@ -126,7 +127,7 @@
 
     public CachedPC get(Object oid)
     {
-        return (CachedPC) client.get(cacheName + getCacheKeyForId(oid));
+        return (CachedPC) client.get(getCacheKeyForId(oid));
     }
 
     public int getSize()
@@ -146,8 +147,7 @@
             return null;
         }
 
-        client.set(cacheName + getCacheKeyForId(oid), expireSeconds, pc);
-
+        client.set(getCacheKeyForId(oid), expireSeconds, pc);
         return pc;
     }
 
@@ -156,11 +156,11 @@
         if (nucleusCtx.getApiAdapter().isSingleFieldIdentity(id))
         {
             String targetClassName = nucleusCtx.getApiAdapter().getTargetClassNameForSingleFieldIdentity(id);
-            return targetClassName + ":" + id;
+            return cacheName + targetClassName + ":" + id.hashCode();
         }
         else
         {
-            return id.toString();
+            return cacheName + id.toString().hashCode();
         }
     }
 }
\ No newline at end of file

Modified: platform/local.repository/trunk/.classpath
===================================================================
--- platform/local.repository/trunk/.classpath	2013-05-28 11:03:55 UTC (rev 17241)
+++ platform/local.repository/trunk/.classpath	2013-05-28 14:56:14 UTC (rev 17242)
@@ -24,7 +24,6 @@
 	<classpathentry exported="true" kind="lib" path="org.apache.directory/jars/shared-ldap-0.9.13.jar"/>
 	<classpathentry exported="true" kind="lib" path="org.apache.directory/jars/shared-ldap-constants-0.9.13.jar"/>
 	<classpathentry exported="true" kind="lib" path="xerces/jars/xercesImpl-2.8.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="net.spy.memcached/jars/memcached-2.3.jar"/>
 	<classpathentry exported="true" kind="lib" path="joda-time/jars/joda-time-1.6.jar"/>
 	<classpathentry exported="true" kind="lib" path="org.apache.poi/jars/poi-3.6.jar"/>
 	<classpathentry exported="true" kind="lib" path="org.apache.poi/jars/poi-ooxml-3.6.jar"/>
@@ -56,5 +55,6 @@
 	<classpathentry exported="true" kind="lib" path="org.mongodb/jars/mongo-java-driver-2.10.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="javax.jdo/jars/jdo-api-3.1-SNAPSHOT.jar"/>
 	<classpathentry exported="true" kind="lib" path="org.eclipse.persistence/jars/javax.persistence-2.1.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="net.spy/jars/spymemcached-2.8.12.jar"/>
 	<classpathentry kind="output" path=""/>
 </classpath>

Modified: platform/local.repository/trunk/META-INF/MANIFEST.MF
===================================================================
--- platform/local.repository/trunk/META-INF/MANIFEST.MF	2013-05-28 11:03:55 UTC (rev 17241)
+++ platform/local.repository/trunk/META-INF/MANIFEST.MF	2013-05-28 14:56:14 UTC (rev 17242)
@@ -233,14 +233,19 @@
  net.sf.saxon.type,
  net.sf.saxon.value,
  net.sf.swarmcache,
- net.spy.memcached,
- net.spy.memcached.compat,
- net.spy.memcached.compat.log,
- net.spy.memcached.ops,
- net.spy.memcached.protocol,
- net.spy.memcached.protocol.ascii,
- net.spy.memcached.protocol.binary,
- net.spy.memcached.transcoders,
+ net.spy.memcached;version="2.8.12",
+ net.spy.memcached.auth;version="2.8.12",
+ net.spy.memcached.compat;version="2.8.12",
+ net.spy.memcached.compat.log;version="2.8.12",
+ net.spy.memcached.internal;version="2.8.12",
+ net.spy.memcached.ops;version="2.8.12",
+ net.spy.memcached.protocol;version="2.8.12",
+ net.spy.memcached.protocol.ascii;version="2.8.12",
+ net.spy.memcached.protocol.binary;version="2.8.12",
+ net.spy.memcached.spring;version="2.8.12",
+ net.spy.memcached.tapmessage;version="2.8.12",
+ net.spy.memcached.transcoders;version="2.8.12",
+ net.spy.memcached.util;version="2.8.12",
  oracle.core.lmx,
  oracle.core.lvf,
  oracle.jdbc,

Added: platform/local.repository/trunk/net.spy/jars/spymemcached-2.8.12.jar
===================================================================
(Binary files differ)

Index: platform/local.repository/trunk/net.spy/jars/spymemcached-2.8.12.jar
===================================================================
--- platform/local.repository/trunk/net.spy/jars/spymemcached-2.8.12.jar	2013-05-28 11:03:55 UTC (rev 17241)
+++ platform/local.repository/trunk/net.spy/jars/spymemcached-2.8.12.jar	2013-05-28 14:56:14 UTC (rev 17242)

Property changes on: platform/local.repository/trunk/net.spy/jars/spymemcached-2.8.12.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[DataNucleus-commits] SF.net SVN: datanucleus:[17254] platform

From: <andy_jefferson@us...> - 2013-05-29 08:33

Revision: 17254
          http://sourceforge.net/p/datanucleus/code/17254
Author:   andy_jefferson
Date:     2013-05-29 08:33:04 +0000 (Wed, 29 May 2013)
Log Message:
-----------
inherit sonatype

Modified Paths:
--------------
    platform/jdo.query/trunk/pom.xml
    platform/jpa.query/trunk/pom.xml

Modified: platform/jdo.query/trunk/pom.xml
===================================================================
--- platform/jdo.query/trunk/pom.xml	2013-05-29 07:05:16 UTC (rev 17253)
+++ platform/jdo.query/trunk/pom.xml	2013-05-29 08:33:04 UTC (rev 17254)
@@ -2,6 +2,11 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
                       http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>org.sonatype.oss</groupId>
+        <artifactId>oss-parent</artifactId>
+        <version>7</version>
+    </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.datanucleus</groupId>
     <artifactId>datanucleus-jdo-query</artifactId>
@@ -198,4 +203,34 @@
             </extension> 
         </extensions> 
     </build>
+
+    <profiles>
+        <profile>
+            <id>release-sign-artifacts</id>
+            <activation>
+                <property>
+                    <name>performRelease</name>
+                    <value>true</value>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <version>1.1</version>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>

Modified: platform/jpa.query/trunk/pom.xml
===================================================================
--- platform/jpa.query/trunk/pom.xml	2013-05-29 07:05:16 UTC (rev 17253)
+++ platform/jpa.query/trunk/pom.xml	2013-05-29 08:33:04 UTC (rev 17254)
@@ -2,6 +2,11 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
                       http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>org.sonatype.oss</groupId>
+        <artifactId>oss-parent</artifactId>
+        <version>7</version>
+    </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.datanucleus</groupId>
     <artifactId>datanucleus-jpa-query</artifactId>
@@ -193,4 +198,34 @@
             </extension> 
         </extensions> 
     </build>
+
+    <profiles>
+        <profile>
+            <id>release-sign-artifacts</id>
+            <activation>
+                <property>
+                    <name>performRelease</name>
+                    <value>true</value>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <version>1.1</version>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>

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

[DataNucleus-commits] SF.net SVN: datanucleus:[17271] platform

From: <andy_jefferson@us...> - 2013-05-31 14:26

Revision: 17271
          http://sourceforge.net/p/datanucleus/code/17271
Author:   andy_jefferson
Date:     2013-05-31 14:26:14 +0000 (Fri, 31 May 2013)
Log Message:
-----------
only apply discrim fallback value when concrete class

Modified Paths:
--------------
    platform/api.jpa/trunk/src/java/org/datanucleus/api/jpa/metadata/JPAAnnotationReader.java
    platform/core/trunk/src/java/org/datanucleus/metadata/DiscriminatorMetaData.java

Modified: platform/api.jpa/trunk/src/java/org/datanucleus/api/jpa/metadata/JPAAnnotationReader.java
===================================================================
--- platform/api.jpa/trunk/src/java/org/datanucleus/api/jpa/metadata/JPAAnnotationReader.java	2013-05-31 10:06:41 UTC (rev 17270)
+++ platform/api.jpa/trunk/src/java/org/datanucleus/api/jpa/metadata/JPAAnnotationReader.java	2013-05-31 14:26:14 UTC (rev 17271)
@@ -844,10 +844,14 @@
                 }
                 else
                 {
-                    // No value so use class-name
-                    discriminatorValue = cls.getName();
+                    if (!Modifier.isAbstract(cls.getModifiers()))
+                    {
+                        // No value and concrete class so use class-name
+                        discriminatorValue = cls.getName();
+                        dismd.setValue(discriminatorValue);
+                    }
                     dismd.setColumnName(discriminatorColumnName);
-                    dismd.setValue(discriminatorValue).setStrategy(DiscriminatorStrategy.VALUE_MAP).setIndexed("false");
+                    dismd.setStrategy(DiscriminatorStrategy.VALUE_MAP).setIndexed("false");
                 }
 
                 ColumnMetaData discolmd = null;

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/DiscriminatorMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/DiscriminatorMetaData.java	2013-05-31 10:06:41 UTC (rev 17270)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/DiscriminatorMetaData.java	2013-05-31 14:26:14 UTC (rev 17271)
@@ -94,10 +94,14 @@
 
         if (strategy == DiscriminatorStrategy.VALUE_MAP && value == null)
         {
-            // Using "value-map" and no value provided so fall back to class name.
-            String className = ((AbstractClassMetaData)parent.getParent()).getFullClassName();
-            NucleusLogger.METADATA.warn(LOCALISER.msg("044103", className));
-            this.value = className;
+            AbstractClassMetaData cmd = (AbstractClassMetaData)parent.getParent();
+            if (cmd instanceof InterfaceMetaData || (cmd instanceof ClassMetaData && !((ClassMetaData)cmd).isAbstract()))
+            {
+                // Using "value-map" and no value provided so fall back to class name.
+                String className = cmd.getFullClassName();
+                NucleusLogger.METADATA.warn(LOCALISER.msg("044103", className));
+                this.value = className;
+            }
         }
 
         if (columnMetaData == null && columnName != 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:[17340] platform

From: <andy_jefferson@us...> - 2013-06-07 12:39

Revision: 17340
          http://sourceforge.net/p/datanucleus/code/17340
Author:   andy_jefferson
Date:     2013-06-07 12:39:00 +0000 (Fri, 07 Jun 2013)
Log Message:
-----------
deps

Modified Paths:
--------------
    platform/api.jdo/trunk/META-INF/MANIFEST.MF
    platform/api.jdo/trunk/pom.xml
    platform/api.jpa/trunk/META-INF/MANIFEST.MF
    platform/api.jpa/trunk/pom.xml

Modified: platform/api.jdo/trunk/META-INF/MANIFEST.MF
===================================================================
--- platform/api.jdo/trunk/META-INF/MANIFEST.MF	2013-06-07 12:36:46 UTC (rev 17339)
+++ platform/api.jdo/trunk/META-INF/MANIFEST.MF	2013-06-07 12:39:00 UTC (rev 17340)
@@ -4,7 +4,7 @@
 Bundle-SymbolicName: org.datanucleus.api.jdo;singleton:=true
 Bundle-Vendor: DataNucleus
 Bundle-Version: 3.2.3
-Require-Bundle: org.datanucleus;bundle-version="3.2.0.m4"
+Require-Bundle: org.datanucleus;bundle-version="3.2.4"
 Import-Package: javax.jdo;version="3.0.0",
  javax.jdo.annotations;version="3.0.0",
  javax.jdo.datastore;version="3.0.0",

Modified: platform/api.jdo/trunk/pom.xml
===================================================================
--- platform/api.jdo/trunk/pom.xml	2013-06-07 12:36:46 UTC (rev 17339)
+++ platform/api.jdo/trunk/pom.xml	2013-06-07 12:39:00 UTC (rev 17340)
@@ -59,7 +59,7 @@
         <dependency>
             <groupId>org.datanucleus</groupId>
             <artifactId>datanucleus-core</artifactId>
-            <version>[3.2.0-m4, )</version>
+            <version>[3.2.4-SNAPSHOT, )</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

Modified: platform/api.jpa/trunk/META-INF/MANIFEST.MF
===================================================================
--- platform/api.jpa/trunk/META-INF/MANIFEST.MF	2013-06-07 12:36:46 UTC (rev 17339)
+++ platform/api.jpa/trunk/META-INF/MANIFEST.MF	2013-06-07 12:39:00 UTC (rev 17340)
@@ -3,7 +3,7 @@
 Bundle-Name: DataNucleus JPA API
 Bundle-SymbolicName: org.datanucleus.api.jpa;singleton:=true
 Bundle-Version: 3.3.0.m1
-Require-Bundle: org.datanucleus;bundle-version="3.2.0"
+Require-Bundle: org.datanucleus;bundle-version="3.2.4"
 Bundle-Vendor: DataNucleus
 Import-Package: javax.jdo;version="3.0.0",
  javax.jdo.annotations;version="3.0.0",

Modified: platform/api.jpa/trunk/pom.xml
===================================================================
--- platform/api.jpa/trunk/pom.xml	2013-06-07 12:36:46 UTC (rev 17339)
+++ platform/api.jpa/trunk/pom.xml	2013-06-07 12:39:00 UTC (rev 17340)
@@ -71,7 +71,7 @@
         <dependency>
             <groupId>org.datanucleus</groupId>
             <artifactId>datanucleus-core</artifactId>
-            <version>[3.2.2, )</version>
+            <version>[3.2.4-SNAPSHOT, )</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

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

[DataNucleus-commits] SF.net SVN: datanucleus:[17350] platform

From: <andy_jefferson@us...> - 2013-06-08 07:39

Revision: 17350
          http://sourceforge.net/p/datanucleus/code/17350
Author:   andy_jefferson
Date:     2013-06-08 07:39:48 +0000 (Sat, 08 Jun 2013)
Log Message:
-----------
Minor improvements to method usage on FetchPlan, improve toString() so we can debug more easier

Modified Paths:
--------------
    platform/api.jpa/trunk/src/java/org/datanucleus/api/jpa/JPAEntityManagerFactory.java
    platform/api.jpa/trunk/src/java/org/datanucleus/api/jpa/metadata/JPAMetaDataHandler.java
    platform/core/trunk/src/java/org/datanucleus/FetchPlan.java
    platform/core/trunk/src/java/org/datanucleus/FetchPlanForClass.java
    platform/core/trunk/src/java/org/datanucleus/state/AbstractStateManager.java
    platform/core/trunk/src/java/org/datanucleus/state/JDOStateManager.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/sql/SQLStatementHelper.java

Modified: platform/api.jpa/trunk/src/java/org/datanucleus/api/jpa/JPAEntityManagerFactory.java
===================================================================
--- platform/api.jpa/trunk/src/java/org/datanucleus/api/jpa/JPAEntityManagerFactory.java	2013-06-07 14:44:59 UTC (rev 17349)
+++ platform/api.jpa/trunk/src/java/org/datanucleus/api/jpa/JPAEntityManagerFactory.java	2013-06-08 07:39:48 UTC (rev 17350)
@@ -1010,6 +1010,7 @@
     {
         if (entityGraphsByName != null)
         {
+            // TODO Need to link NamedEntityGraphs to these dynamic graphs
             return entityGraphsByName.get(graphName);
         }
         return null;

Modified: platform/api.jpa/trunk/src/java/org/datanucleus/api/jpa/metadata/JPAMetaDataHandler.java
===================================================================
--- platform/api.jpa/trunk/src/java/org/datanucleus/api/jpa/metadata/JPAMetaDataHandler.java	2013-06-07 14:44:59 UTC (rev 17349)
+++ platform/api.jpa/trunk/src/java/org/datanucleus/api/jpa/metadata/JPAMetaDataHandler.java	2013-06-08 07:39:48 UTC (rev 17350)
@@ -934,7 +934,6 @@
             else if (localName.equals("primary-key-join-column"))
             {
                 MetaData md = getStack();
-                NucleusLogger.GENERAL.info(">> pk-join-col parent=" + md);
                 if (md instanceof ClassMetaData)
                 {
                     // Join columns between PK of subclass table and PK of base class table

Modified: platform/core/trunk/src/java/org/datanucleus/FetchPlan.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/FetchPlan.java	2013-06-07 14:44:59 UTC (rev 17349)
+++ platform/core/trunk/src/java/org/datanucleus/FetchPlan.java	2013-06-08 07:39:48 UTC (rev 17350)
@@ -32,6 +32,7 @@
 import org.datanucleus.metadata.AbstractClassMetaData;
 import org.datanucleus.util.Localiser;
 import org.datanucleus.util.SoftValueMap;
+import org.datanucleus.util.StringUtils;
 
 /**
  * FetchPlan for fields for use internally.
@@ -131,9 +132,22 @@
     }
 
     /**
-     * Manage the fetch plan for the class
+     * Mark all managed fetch plans to be dirty, so the active members need to be recomputed.
+     */
+    private void markDirty()
+    {
+        Iterator<FetchPlanForClass> it = managedClass.values().iterator();
+        while (it.hasNext())
+        {
+            it.next().markDirty();
+        }
+    }
+
+    /**
+     * Manage the fetch plan for the class if it isn't already managed.
      * @param cmd MetaData for the class to manage
      * @return the FetchPlanForClass
+     * @deprecated Use getFetchPlanForClass
      */
     public FetchPlanForClass manageFetchPlanForClass(AbstractClassMetaData cmd)
     {
@@ -147,25 +161,19 @@
     }
 
     /**
-     * Mark all managed fetch plans to be dirty, so the active members need to be recomputed.
-     */
-    private void markDirty()
-    {
-        Iterator<FetchPlanForClass> it = managedClass.values().iterator();
-        while (it.hasNext())
-        {
-            it.next().markDirty();
-        }
-    }
-
-    /**
      * Access the fetch plan for the class.
      * @param cmd metadata for the class
      * @return the FetchPlanForClass
      */
     public synchronized FetchPlanForClass getFetchPlanForClass(AbstractClassMetaData cmd)
     {
-        return managedClass.get(cmd);
+        FetchPlanForClass fpClass = managedClass.get(cmd);
+        if (fpClass == null)
+        {
+            fpClass = new FetchPlanForClass(cmd, this);
+            managedClass.put(cmd, fpClass);
+        }
+        return fpClass;
     }
 
     /**
@@ -568,15 +576,6 @@
         return this;
     }
 
-    /*
-     * (non-Javadoc)
-     * @see java.lang.Object#toString()
-     */
-    public String toString()
-    {
-        return groups.toString();
-    }
-
     /**
      * Returns a copy of this FetchPlan with all settings initialized.
      * Used when a Query has to have its own FetchPlan, so takes a copy of that of the ExecutionContext.
@@ -655,4 +654,13 @@
             cachedIsToCallPostLoadFetchPlan.clear();
         }
     }
+
+    /*
+     * (non-Javadoc)
+     * @see java.lang.Object#toString()
+     */
+    public String toString()
+    {
+        return "FetchPlan " + groups.toString() + " classes=" + StringUtils.collectionToString(managedClass.values());
+    }
 }
\ No newline at end of file

Modified: platform/core/trunk/src/java/org/datanucleus/FetchPlanForClass.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/FetchPlanForClass.java	2013-06-07 14:44:59 UTC (rev 17349)
+++ platform/core/trunk/src/java/org/datanucleus/FetchPlanForClass.java	2013-06-08 07:39:48 UTC (rev 17350)
@@ -32,6 +32,7 @@
 import org.datanucleus.metadata.FieldPersistenceModifier;
 import org.datanucleus.util.Localiser;
 import org.datanucleus.util.NucleusLogger;
+import org.datanucleus.util.StringUtils;
 
 /**
  * Representation of the fetch plan for a particular class, defining the members that are to be fetched.
@@ -84,6 +85,11 @@
         return cmd;
     }
 
+    public String toString()
+    {
+        return "FP[class="+cmd.getFullClassName() + " members=" + StringUtils.intArrayToString(getMemberNumbers()) + "]";
+    }
+
     void markDirty()
     {
         dirty = true;
@@ -229,7 +235,6 @@
         {
             // Recurse to superclass
             AbstractClassMetaData superCmd = cmd.getSuperAbstractClassMetaData();
-            plan.manageFetchPlanForClass(superCmd);
             FetchPlanForClass superFpc = plan.getFetchPlanForClass(superCmd);
             bitSet.or(superFpc.getMemberNumbersByBitSet(superCmd));
         }

Modified: platform/core/trunk/src/java/org/datanucleus/state/AbstractStateManager.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/state/AbstractStateManager.java	2013-06-07 14:44:59 UTC (rev 17349)
+++ platform/core/trunk/src/java/org/datanucleus/state/AbstractStateManager.java	2013-06-08 07:39:48 UTC (rev 17350)
@@ -188,7 +188,7 @@
         this.loadedFields = new boolean[fieldCount];
         this.dirty = false;
         this.myEC = ec;
-        this.myFP = myEC.getFetchPlan().manageFetchPlanForClass(cmd);
+        this.myFP = myEC.getFetchPlan().getFetchPlanForClass(cmd);
         this.lock = new ReentrantLock();
         this.lockMode = LockManager.LOCK_MODE_NONE;
         this.savedFlags = 0;

Modified: platform/core/trunk/src/java/org/datanucleus/state/JDOStateManager.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/state/JDOStateManager.java	2013-06-07 14:44:59 UTC (rev 17349)
+++ platform/core/trunk/src/java/org/datanucleus/state/JDOStateManager.java	2013-06-08 07:39:48 UTC (rev 17350)
@@ -2444,7 +2444,7 @@
             {
                 throw new NucleusUserException("This method should only be used for objects using application identity.").setFatal();
             }
-            myFP = myEC.getFetchPlan().manageFetchPlanForClass(cmd);
+            myFP = myEC.getFetchPlan().getFetchPlanForClass(cmd);
 
             int fieldCount = cmd.getMemberCount();
             dirtyFields = new boolean[fieldCount];
@@ -2530,7 +2530,7 @@
         FetchPlan loadFetchPlan = fv.getFetchPlanForLoading();
         if (loadFetchPlan != null)
         {
-            myFP = loadFetchPlan.manageFetchPlanForClass(cmd);
+            myFP = loadFetchPlan.getFetchPlanForClass(cmd);
         }
 
         boolean callPostLoad = myFP.isToCallPostLoadFetchPlan(this.loadedFields);
@@ -3037,7 +3037,7 @@
      */
     public void loadUnloadedFieldsOfClassInFetchPlan(FetchPlan fetchPlan)
     {
-        FetchPlanForClass fpc = fetchPlan.manageFetchPlanForClass(this.cmd);
+        FetchPlanForClass fpc = fetchPlan.getFetchPlanForClass(this.cmd);
         int[] fieldNumbers = ClassUtils.getFlagsSetTo(loadedFields, fpc.getMemberNumbers(), false);
         if (fieldNumbers != null && fieldNumbers.length > 0)
         {

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2013-06-07 14:44:59 UTC (rev 17349)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2013-06-08 07:39:48 UTC (rev 17350)
@@ -470,7 +470,6 @@
             List<AbstractClassMetaData> cmdsForCollection = entry.getValue();
 
             AbstractClassMetaData rootCmd = cmdsForCollection.get(0);
-            q.getFetchPlan().manageFetchPlanForClass(rootCmd);
             int[] fpMembers = q.getFetchPlan().getFetchPlanForClass(rootCmd).getMemberNumbers();
             BasicDBObject fieldsSelection = new BasicDBObject();
             if (fpMembers != null && fpMembers.length > 0)

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/sql/SQLStatementHelper.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/sql/SQLStatementHelper.java	2013-06-07 14:44:59 UTC (rev 17349)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/sql/SQLStatementHelper.java	2013-06-08 07:39:48 UTC (rev 17350)
@@ -561,7 +561,6 @@
         if (fetchPlan != null)
         {
             // Use FetchPlan fields
-            fetchPlan.manageFetchPlanForClass(sourceCmd);
             FetchPlanForClass fpc = fetchPlan.getFetchPlanForClass(sourceCmd);
             fieldNumbers = fpc.getMemberNumbers();
         }

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

[DataNucleus-commits] SF.net SVN: datanucleus:[17356] platform

From: <andy_jefferson@us...> - 2013-06-09 08:42

Revision: 17356
          http://sourceforge.net/p/datanucleus/code/17356
Author:   andy_jefferson
Date:     2013-06-09 08:42:16 +0000 (Sun, 09 Jun 2013)
Log Message:
-----------
<index>, <unique>, <foreign-key> only need field *name* not a full FieldMetaData

Modified Paths:
--------------
    platform/api.jdo/trunk/src/java/org/datanucleus/api/jdo/metadata/ForeignKeyMetadataImpl.java
    platform/api.jdo/trunk/src/java/org/datanucleus/api/jdo/metadata/IndexMetadataImpl.java
    platform/api.jdo/trunk/src/java/org/datanucleus/api/jdo/metadata/JDOAnnotationUtils.java
    platform/api.jdo/trunk/src/java/org/datanucleus/api/jdo/metadata/JDOMetaDataHandler.java
    platform/api.jdo/trunk/src/java/org/datanucleus/api/jdo/metadata/UniqueMetadataImpl.java
    platform/core/trunk/src/java/org/datanucleus/metadata/AbstractConstraintMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/ForeignKeyMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/IndexMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/UniqueMetaData.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBStoreManager.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ClassTable.java

Modified: platform/api.jdo/trunk/src/java/org/datanucleus/api/jdo/metadata/ForeignKeyMetadataImpl.java
===================================================================
--- platform/api.jdo/trunk/src/java/org/datanucleus/api/jdo/metadata/ForeignKeyMetadataImpl.java	2013-06-09 07:37:21 UTC (rev 17355)
+++ platform/api.jdo/trunk/src/java/org/datanucleus/api/jdo/metadata/ForeignKeyMetadataImpl.java	2013-06-09 08:42:16 UTC (rev 17356)
@@ -24,7 +24,6 @@
 import javax.jdo.metadata.MemberMetadata;
 import javax.jdo.metadata.PropertyMetadata;
 
-import org.datanucleus.metadata.AbstractMemberMetaData;
 import org.datanucleus.metadata.ColumnMetaData;
 import org.datanucleus.metadata.FieldMetaData;
 import org.datanucleus.metadata.ForeignKeyMetaData;
@@ -123,8 +122,8 @@
      */
     public int getNumberOfMembers()
     {
-        AbstractMemberMetaData[] internalMmds = getInternal().getMemberMetaData();
-        return (internalMmds != null ? internalMmds.length : 0);
+        String[] internalMemberNames = getInternal().getMemberNames();
+        return (internalMemberNames != null ? internalMemberNames.length : 0);
     }
 
     /* (non-Javadoc)
@@ -132,22 +131,16 @@
      */
     public MemberMetadata[] getMembers()
     {
-        AbstractMemberMetaData[] internalMmds = getInternal().getMemberMetaData();
-        if (internalMmds == null)
+        String[] internalMemberNames = getInternal().getMemberNames();
+        if (internalMemberNames == null)
         {
             return null;
         }
-        MemberMetadataImpl[] mmds = new MemberMetadataImpl[internalMmds.length];
+        MemberMetadataImpl[] mmds = new MemberMetadataImpl[internalMemberNames.length];
         for (int i=0;i<mmds.length;i++)
         {
-            if (internalMmds[i] instanceof FieldMetaData)
-            {
-                mmds[i] = new FieldMetadataImpl((FieldMetaData)internalMmds[i]);
-            }
-            else
-            {
-                mmds[i] = new PropertyMetadataImpl((PropertyMetaData)internalMmds[i]);
-            }
+            FieldMetaData fmd = new FieldMetaData(getInternal(), internalMemberNames[i]);
+            mmds[i] = new FieldMetadataImpl(fmd);
             mmds[i].parent = this;
         }
         return mmds;
@@ -214,7 +207,7 @@
      */
     public FieldMetadata newFieldMetadata(String name)
     {
-        FieldMetaData internalFmd = getInternal().newFieldMetaData(name);
+        FieldMetaData internalFmd = new FieldMetaData(getInternal(), name);
         FieldMetadataImpl fmd = new FieldMetadataImpl(internalFmd);
         fmd.parent = this;
         return fmd;
@@ -225,7 +218,7 @@
      */
     public PropertyMetadata newPropertyMetadata(String name)
     {
-        PropertyMetaData internalPmd = getInternal().newPropertyMetaData(name);
+        PropertyMetaData internalPmd = new PropertyMetaData(getInternal(), name);
         PropertyMetadataImpl pmd = new PropertyMetadataImpl(internalPmd);
         pmd.parent = this;
         return pmd;

Modified: platform/api.jdo/trunk/src/java/org/datanucleus/api/jdo/metadata/IndexMetadataImpl.java
===================================================================
--- platform/api.jdo/trunk/src/java/org/datanucleus/api/jdo/metadata/IndexMetadataImpl.java	2013-06-09 07:37:21 UTC (rev 17355)
+++ platform/api.jdo/trunk/src/java/org/datanucleus/api/jdo/metadata/IndexMetadataImpl.java	2013-06-09 08:42:16 UTC (rev 17356)
@@ -23,7 +23,6 @@
 import javax.jdo.metadata.MemberMetadata;
 import javax.jdo.metadata.PropertyMetadata;
 
-import org.datanucleus.metadata.AbstractMemberMetaData;
 import org.datanucleus.metadata.ColumnMetaData;
 import org.datanucleus.metadata.FieldMetaData;
 import org.datanucleus.metadata.IndexMetaData;
@@ -68,22 +67,16 @@
      */
     public MemberMetadata[] getMembers()
     {
-        AbstractMemberMetaData[] internalMmds = getInternal().getMemberMetaData();
-        if (internalMmds == null)
+        String[] internalMemberNames = getInternal().getMemberNames();
+        if (internalMemberNames == null)
         {
             return null;
         }
-        MemberMetadataImpl[] mmds = new MemberMetadataImpl[internalMmds.length];
+        MemberMetadataImpl[] mmds = new MemberMetadataImpl[internalMemberNames.length];
         for (int i=0;i<mmds.length;i++)
         {
-            if (internalMmds[i] instanceof FieldMetaData)
-            {
-                mmds[i] = new FieldMetadataImpl((FieldMetaData)internalMmds[i]);
-            }
-            else
-            {
-                mmds[i] = new PropertyMetadataImpl((PropertyMetaData)internalMmds[i]);
-            }
+            FieldMetaData fmd = new FieldMetaData(getInternal(), internalMemberNames[i]);
+            mmds[i] = new FieldMetadataImpl(fmd);
             mmds[i].parent = this;
         }
         return mmds;
@@ -111,8 +104,8 @@
      */
     public int getNumberOfMembers()
     {
-        AbstractMemberMetaData[] mmds = getInternal().getMemberMetaData();
-        return (mmds != null ? mmds.length : 0);
+        String[] memberNames = getInternal().getMemberNames();
+        return (memberNames != null ? memberNames.length : 0);
     }
 
     /* (non-Javadoc)
@@ -147,7 +140,7 @@
      */
     public FieldMetadata newFieldMetadata(String name)
     {
-        FieldMetaData internalFmd = getInternal().newFieldMetaData(name);
+        FieldMetaData internalFmd = new FieldMetaData(getInternal(), name);
         FieldMetadataImpl fmd = new FieldMetadataImpl(internalFmd);
         fmd.parent = this;
         return fmd;
@@ -158,7 +151,7 @@
      */
     public PropertyMetadata newPropertyMetadata(String name)
     {
-        PropertyMetaData internalPmd = getInternal().newPropertyMetaData(name);
+        PropertyMetaData internalPmd = new PropertyMetaData(getInternal(), name);
         PropertyMetadataImpl pmd = new PropertyMetadataImpl(internalPmd);
         pmd.parent = this;
         return pmd;

Modified: platform/api.jdo/trunk/src/java/org/datanucleus/api/jdo/metadata/JDOAnnotationUtils.java
===================================================================
--- platform/api.jdo/trunk/src/java/org/datanucleus/api/jdo/metadata/JDOAnnotationUtils.java	2013-06-09 07:37:21 UTC (rev 17355)
+++ platform/api.jdo/trunk/src/java/org/datanucleus/api/jdo/metadata/JDOAnnotationUtils.java	2013-06-09 08:42:16 UTC (rev 17356)
@@ -64,7 +64,6 @@
 
 import org.datanucleus.metadata.ColumnMetaData;
 import org.datanucleus.metadata.DiscriminatorStrategy;
-import org.datanucleus.metadata.FieldMetaData;
 import org.datanucleus.metadata.ForeignKeyMetaData;
 import org.datanucleus.metadata.IdentityStrategy;
 import org.datanucleus.metadata.IdentityType;
@@ -542,8 +541,7 @@
         {
             for (int j=0;j<fields.length;j++)
             {
-                FieldMetaData fmd = new FieldMetaData(idxmd, fields[j]);
-                idxmd.addMember(fmd);
+                idxmd.addMember(fields[j]);
             }
         }
         if (idxmd.getNumberOfMembers() == 0 && columns != null && columns.length > 0)
@@ -578,8 +576,7 @@
         {
             for (int j=0;j<fields.length;j++)
             {
-                FieldMetaData fmd = new FieldMetaData(unimd, fields[j]);
-                unimd.addMember(fmd);
+                unimd.addMember(fields[j]);
             }
         }
         if (unimd.getNumberOfMembers() == 0 && columns != null && columns.length > 0)
@@ -618,8 +615,7 @@
         {
             for (int j=0;j<fields.length;j++)
             {
-                FieldMetaData fmd = new FieldMetaData(fkmd, fields[j]);
-                fkmd.addMember(fmd);
+                fkmd.addMember(fields[j]);
             }
         }
         if (fkmd.getNumberOfMembers() == 0 && columns != null && columns.length > 0)

Modified: platform/api.jdo/trunk/src/java/org/datanucleus/api/jdo/metadata/JDOMetaDataHandler.java
===================================================================
--- platform/api.jdo/trunk/src/java/org/datanucleus/api/jdo/metadata/JDOMetaDataHandler.java	2013-06-09 07:37:21 UTC (rev 17355)
+++ platform/api.jdo/trunk/src/java/org/datanucleus/api/jdo/metadata/JDOMetaDataHandler.java	2013-06-09 08:42:16 UTC (rev 17356)
@@ -528,17 +528,17 @@
                 else if (md instanceof ForeignKeyMetaData)
                 {
                     ForeignKeyMetaData fkmd = (ForeignKeyMetaData)md;
-                    fkmd.addMember(fmd);
+                    fkmd.addMember(fmd.getName());
                 }
                 else if (md instanceof IndexMetaData)
                 {
                     IndexMetaData imd = (IndexMetaData)md;
-                    imd.addMember(fmd);
+                    imd.addMember(fmd.getName());
                 }
                 else if (md instanceof UniqueMetaData)
                 {
                     UniqueMetaData umd = (UniqueMetaData)md;
-                    umd.addMember(fmd);
+                    umd.addMember(fmd.getName());
                 }
                 pushStack(fmd);
             }

Modified: platform/api.jdo/trunk/src/java/org/datanucleus/api/jdo/metadata/UniqueMetadataImpl.java
===================================================================
--- platform/api.jdo/trunk/src/java/org/datanucleus/api/jdo/metadata/UniqueMetadataImpl.java	2013-06-09 07:37:21 UTC (rev 17355)
+++ platform/api.jdo/trunk/src/java/org/datanucleus/api/jdo/metadata/UniqueMetadataImpl.java	2013-06-09 08:42:16 UTC (rev 17356)
@@ -23,7 +23,6 @@
 import javax.jdo.metadata.PropertyMetadata;
 import javax.jdo.metadata.UniqueMetadata;
 
-import org.datanucleus.metadata.AbstractMemberMetaData;
 import org.datanucleus.metadata.ColumnMetaData;
 import org.datanucleus.metadata.FieldMetaData;
 import org.datanucleus.metadata.PropertyMetaData;
@@ -76,22 +75,16 @@
      */
     public MemberMetadata[] getMembers()
     {
-        AbstractMemberMetaData[] internalMmds = getInternal().getMemberMetaData();
-        if (internalMmds == null)
+        String[] internalMemberNames = getInternal().getMemberNames();
+        if (internalMemberNames == null)
         {
             return null;
         }
-        MemberMetadataImpl[] mmds = new MemberMetadataImpl[internalMmds.length];
+        MemberMetadataImpl[] mmds = new MemberMetadataImpl[internalMemberNames.length];
         for (int i=0;i<mmds.length;i++)
         {
-            if (internalMmds[i] instanceof FieldMetaData)
-            {
-                mmds[i] = new FieldMetadataImpl((FieldMetaData)internalMmds[i]);
-            }
-            else
-            {
-                mmds[i] = new PropertyMetadataImpl((PropertyMetaData)internalMmds[i]);
-            }
+            FieldMetaData fmd = new FieldMetaData(getInternal(), internalMemberNames[i]);
+            mmds[i] = new FieldMetadataImpl(fmd);
             mmds[i].parent = this;
         }
         return mmds;
@@ -119,8 +112,8 @@
      */
     public int getNumberOfMembers()
     {
-        AbstractMemberMetaData[] mmds = getInternal().getMemberMetaData();
-        return (mmds != null ? mmds.length : 0);
+        String[] memberNames = getInternal().getMemberNames();
+        return (memberNames != null ? memberNames.length : 0);
     }
 
     /* (non-Javadoc)
@@ -147,7 +140,7 @@
      */
     public FieldMetadata newFieldMetadata(String name)
     {
-        FieldMetaData internalFmd = getInternal().newFieldMetaData(name);
+        FieldMetaData internalFmd = new FieldMetaData(getInternal(), name);
         FieldMetadataImpl fmd = new FieldMetadataImpl(internalFmd);
         fmd.parent = this;
         return fmd;
@@ -158,7 +151,7 @@
      */
     public PropertyMetadata newPropertyMetadata(String name)
     {
-        PropertyMetaData internalPmd = getInternal().newPropertyMetaData(name);
+        PropertyMetaData internalPmd = new PropertyMetaData(getInternal(), name);
         PropertyMetadataImpl pmd = new PropertyMetadataImpl(internalPmd);
         pmd.parent = this;
         return pmd;

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/AbstractConstraintMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/AbstractConstraintMetaData.java	2013-06-09 07:37:21 UTC (rev 17355)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/AbstractConstraintMetaData.java	2013-06-09 08:42:16 UTC (rev 17356)
@@ -20,8 +20,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.datanucleus.ClassLoaderResolver;
-
 /**
  * Abstract representation of an ORM constraint.
  */
@@ -33,11 +31,11 @@
     /** the constraint table name. Name of the table to which this applies (null implies the enclosing class' table). */
     protected String table;
 
-    /** The fields/properties for this constraint. */
-    protected List<AbstractMemberMetaData> members = new ArrayList();
+    /** The member names for this constraint. */
+    protected List<String> memberNames = null;
 
-    /** The columns for this constraint. */
-    protected List<ColumnMetaData> columns = new ArrayList();
+    /** The columns for this constraint. TODO Could we make this columnNames? */
+    protected List<ColumnMetaData> columns = null;
 
     /**
      * Default constructor. Set fields using setters before populate().
@@ -55,18 +53,11 @@
         this.name = acmd.name;
         this.table = acmd.table;
 
-        if (acmd.members != null)
+        if (acmd.memberNames != null)
         {
-            for (AbstractMemberMetaData mmd : acmd.members)
+            for (String memberName : acmd.memberNames)
             {
-                if (mmd instanceof FieldMetaData)
-                {
-                    addMember(new FieldMetaData(this, mmd));
-                }
-                else
-                {
-                    addMember(new PropertyMetaData(this, (PropertyMetaData) mmd));
-                }
+                addMember(memberName);
             }
         }
         if (acmd.columns != null)
@@ -79,72 +70,28 @@
     }
 
     /**
-     * Method to initialise the object, creating internal convenience arrays.
-     * Initialise all sub-objects.
+     * Add a new member that is part of this constraint.
+     * @param memberName member name for the field/property
      */
-    public void initialise(ClassLoaderResolver clr, MetaDataManager mmgr)
+    public void addMember(String memberName)
     {
-        if (isInitialised())
+        if (memberNames == null)
         {
-            return;
+            memberNames = new ArrayList<String>();
         }
-
-        if (!members.isEmpty())
-        {
-            for (AbstractMemberMetaData mmd : members)
-            {
-                mmd.initialise(clr, mmgr);
-            }
-        }
-        if (!columns.isEmpty())
-        {
-            for (ColumnMetaData colmd : columns)
-            {
-                colmd.initialise(clr, mmgr);
-            }
-        }
-
-        setInitialised();
+        memberNames.add(memberName);
     }
 
     /**
-     * Add a new member that is part of this constraint.
-     * @param mmd MetaData for the field/property
-     */
-    public void addMember(AbstractMemberMetaData mmd)
-    {
-        members.add(mmd);
-        mmd.parent = this;
-    }
-
-    /**
-     * Method to create a new field, add it, and return it.
-     * @return The field metadata
-     */
-    public FieldMetaData newFieldMetaData(String name)
-    {
-        FieldMetaData fmd = new FieldMetaData(this, name);
-        addMember(fmd);
-        return fmd;
-    }
-
-    /**
-     * Method to create a new property, add it, and return it.
-     * @return The property metadata
-     */
-    public PropertyMetaData newPropertyMetaData(String name)
-    {
-        PropertyMetaData pmd = new PropertyMetaData(this, name);
-        addMember(pmd);
-        return pmd;
-    }
-
-    /**
      * Add a new ColumnMetaData element
      * @param colmd MetaData for the column
      */
     public void addColumn(ColumnMetaData colmd)
     {
+        if (columns == null)
+        {
+            columns = new ArrayList<ColumnMetaData>();
+        }
         columns.add(colmd);
         colmd.parent = this;
     }
@@ -160,19 +107,27 @@
         return colmd;
     }
 
-    public final AbstractMemberMetaData[] getMemberMetaData()
+    public final String[] getMemberNames()
     {
-        return members.toArray(new AbstractMemberMetaData[members.size()]);
+        if (memberNames == null)
+        {
+            return null;
+        }
+        return memberNames.toArray(new String[memberNames.size()]);
     }
 
     public final ColumnMetaData[] getColumnMetaData()
     {
+        if (columns == null)
+        {
+            return null;
+        }
         return columns.toArray(new ColumnMetaData[columns.size()]);
     }
 
     public int getNumberOfMembers()
     {
-        return (members != null ? members.size() : 0);
+        return (memberNames != null ? memberNames.size() : 0);
     }
 
     public int getNumberOfColumns()

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/ForeignKeyMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/ForeignKeyMetaData.java	2013-06-09 07:37:21 UTC (rev 17355)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/ForeignKeyMetaData.java	2013-06-09 08:42:16 UTC (rev 17356)
@@ -234,11 +234,11 @@
         }
         sb.append(">\n");
 
-        if (members != null)
+        if (memberNames != null)
         {
-            for (AbstractMemberMetaData mmd : members)
+            for (String memberName : memberNames)
             {
-                sb.append(mmd.toString(prefix + indent,indent));
+                sb.append(prefix).append(indent).append("<field name=\"" + memberName + "\"/>");
             }
         }
         if (columns != null)

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/IndexMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/IndexMetaData.java	2013-06-09 07:37:21 UTC (rev 17355)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/IndexMetaData.java	2013-06-09 08:42:16 UTC (rev 17356)
@@ -131,11 +131,11 @@
         }
         sb.append(name != null ? (" name=\"" + name + "\">\n") : ">\n");
 
-        if (members != null)
+        if (memberNames != null)
         {
-            for (AbstractMemberMetaData mmd : members)
+            for (String memberName : memberNames)
             {
-                sb.append(mmd.toString(prefix + indent,indent));
+                sb.append(prefix).append(indent).append("<field name=\"" + memberName + "\"/>");
             }
         }
         if (columns != null)

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/UniqueMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/UniqueMetaData.java	2013-06-09 07:37:21 UTC (rev 17355)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/UniqueMetaData.java	2013-06-09 08:42:16 UTC (rev 17356)
@@ -108,11 +108,11 @@
         }
         sb.append(name != null ? (" name=\"" + name + "\">\n") : ">\n");
 
-        if (members != null)
+        if (memberNames != null)
         {
-            for (AbstractMemberMetaData mmd : members)
+            for (String memberName : memberNames)
             {
-                sb.append(mmd.toString(prefix + indent,indent));
+                sb.append(prefix).append(indent).append("<field name=\"" + memberName + "\"/>");
             }
         }
         if (columns != null)

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBStoreManager.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBStoreManager.java	2013-06-09 07:37:21 UTC (rev 17355)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBStoreManager.java	2013-06-09 08:42:16 UTC (rev 17356)
@@ -458,13 +458,12 @@
                 idxObj.append(idxcolmds[j].getName(), 1);
             }
         }
-        else if (idxmd.getMemberMetaData() != null)
+        else if (idxmd.getMemberNames() != null)
         {
-            AbstractMemberMetaData[] idxmmds = idxmd.getMemberMetaData();
-            for (int j=0;j<idxmmds.length;j++)
+            String[] idxMemberNames = idxmd.getMemberNames();
+            for (int i=0;i<idxMemberNames.length;i++)
             {
-                String memberName = idxmmds[j].getName();
-                AbstractMemberMetaData mmd = cmd.getMetaDataForMember(memberName);
+                AbstractMemberMetaData mmd = cmd.getMetaDataForMember(idxMemberNames[i]);
                 idxObj.append(getNamingFactory().getColumnName(mmd, ColumnType.COLUMN), 1);
             }
         }
@@ -482,13 +481,12 @@
                 uniObj.append(unicolmds[j].getName(), 1);
             }
         }
-        else if (unimd.getMemberMetaData() != null)
+        else if (unimd.getMemberNames() != null)
         {
-            AbstractMemberMetaData[] unimmds = unimd.getMemberMetaData();
-            for (int j=0;j<unimmds.length;j++)
+            String[] uniMemberNames = unimd.getMemberNames();
+            for (int i=0;i<uniMemberNames.length;i++)
             {
-                String memberName = unimmds[j].getName();
-                AbstractMemberMetaData mmd = cmd.getMetaDataForMember(memberName);
+                AbstractMemberMetaData mmd = cmd.getMetaDataForMember(uniMemberNames[i]);
                 uniObj.append(getNamingFactory().getColumnName(mmd, ColumnType.COLUMN), 1);
             }
         }

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ClassTable.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ClassTable.java	2013-06-09 07:37:21 UTC (rev 17355)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ClassTable.java	2013-06-09 08:42:16 UTC (rev 17356)
@@ -2060,7 +2060,7 @@
         // Set the column(s) to index
         // Class-level index so use its column definition
         ColumnMetaData[] colmds = imd.getColumnMetaData();
-        AbstractMemberMetaData[] mmds = imd.getMemberMetaData();
+        String[] memberNames = imd.getMemberNames();
         // a). Columns specified directly
         if (colmds != null && colmds.length > 0)
         {
@@ -2081,12 +2081,12 @@
             }
         }
         // b). Columns specified using fields
-        else if (mmds != null && mmds.length > 0)
+        else if (memberNames != null && memberNames.length > 0)
         {
-            for (int i=0;i<mmds.length;i++)
+            for (int i=0;i<memberNames.length;i++)
             {
                 // Find the metadata for the actual field with the same name as this "index" field
-                AbstractMemberMetaData realFmd = getMetaDataForMember(mmds[i].getName());
+                AbstractMemberMetaData realFmd = getMetaDataForMember(memberNames[i]);
                 JavaTypeMapping fieldMapping = memberMappingsMap.get(realFmd);
                 int countFields = fieldMapping.getNumberOfDatastoreMappings();
                 for (int j=0; j<countFields; j++)
@@ -2320,7 +2320,7 @@
         // Generate the columns for the source of the foreign-key
         List sourceCols = new ArrayList();
         ColumnMetaData[] colmds = fkmd.getColumnMetaData();
-        AbstractMemberMetaData[] fmds = fkmd.getMemberMetaData();
+        String[] memberNames = fkmd.getMemberNames();
         if (colmds != null && colmds.length > 0)
         {
             // FK specified via <column>
@@ -2338,14 +2338,14 @@
                 sourceCols.add(sourceCol);
             }
         }
-        else if (fmds != null && fmds.length > 0)
+        else if (memberNames != null && memberNames.length > 0)
         {
             // FK specified via <field>
-            for (int i=0;i<fmds.length;i++)
+            for (int i=0;i<memberNames.length;i++)
             {
                 // Find the metadata for the actual field with the same name as this "foreign-key" field
                 // and add all columns to the source columns for the FK
-                AbstractMemberMetaData realFmd = getMetaDataForMember(fmds[i].getName());
+                AbstractMemberMetaData realFmd = getMetaDataForMember(memberNames[i]);
                 JavaTypeMapping fieldMapping = memberMappingsMap.get(realFmd);
                 int countCols = fieldMapping.getNumberOfDatastoreMappings();
                 for (int j=0; j<countCols; j++)
@@ -2482,7 +2482,7 @@
 
         // Class-level index so use its column definition
         ColumnMetaData[] colmds = umd.getColumnMetaData();
-        AbstractMemberMetaData[] mmds = umd.getMemberMetaData();
+        String[] memberNames = umd.getMemberNames();
         // a). Columns specified directly
         if (colmds != null && colmds.length > 0)
         {
@@ -2503,16 +2503,16 @@
             }
         }
         // b). Columns specified using fields
-        else if (mmds != null && mmds.length > 0)
+        else if (memberNames != null && memberNames.length > 0)
         {
-            for (int i=0;i<mmds.length;i++)
+            for (int i=0;i<memberNames.length;i++)
             {
                 // Find the metadata for the actual field with the same name as this "unique" field
-                AbstractMemberMetaData realMmd = getMetaDataForMember(mmds[i].getName());
+                AbstractMemberMetaData realMmd = getMetaDataForMember(memberNames[i]);
                 if (realMmd == null)
                 {
                     // User is an idiot and has specified some field that doesnt exist
-                    NucleusLogger.DATASTORE_SCHEMA.warn("Unique metadata defined to use field " + mmds[i].getName() + " which doesn't exist in this class");
+                    NucleusLogger.DATASTORE_SCHEMA.warn("Unique metadata defined to use field " + memberNames[i] + " which doesn't exist in this class");
                     return null;
                 }
                 JavaTypeMapping memberMapping = memberMappingsMap.get(realMmd);

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

[DataNucleus-commits] SF.net SVN: datanucleus:[17547] platform

From: <andy_jefferson@us...> - 2013-06-12 17:39

Revision: 17547
          http://sourceforge.net/p/datanucleus/code/17547
Author:   andy_jefferson
Date:     2013-06-12 17:39:15 +0000 (Wed, 12 Jun 2013)
Log Message:
-----------
clean up some log messages. bump rdbms version

Modified Paths:
--------------
    platform/accessplatform/trunk/build.properties
    platform/store.rdbms/trunk/META-INF/MANIFEST.MF
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/QueryToSQLMapper.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/sql/method/CollectionContainsMethod.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/sql/method/MapContainsKeyMethod.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/sql/method/MapContainsValueMethod.java

Modified: platform/accessplatform/trunk/build.properties
===================================================================
--- platform/accessplatform/trunk/build.properties	2013-06-12 17:12:10 UTC (rev 17546)
+++ platform/accessplatform/trunk/build.properties	2013-06-12 17:39:15 UTC (rev 17547)
@@ -10,17 +10,17 @@
 
 datanucleus.group=org/datanucleus/
 
-datanucleus-core.version=3.2.4
+datanucleus-core.version=3.2.5-SNAPSHOT
 datanucleus-cache.version=3.1.2
 
 datanucleus-api-jdo.version=3.2.3
-datanucleus-api-jpa.version=3.3.0-m1
+datanucleus-api-jpa.version=3.3.0-m2-SNAPSHOT
 datanucleus-api-rest.version=3.2.0-release
 
 datanucleus-jpa-query.version=3.0.2
 datanucleus-jdo-query.version=3.0.2
 
-datanucleus-rdbms.version=3.2.3
+datanucleus-rdbms.version=3.2.4-SNAPSHOT
 datanucleus-mongodb.version=3.2.2
 datanucleus-hbase.version=3.2.1
 datanucleus-neo4j.version=3.2.1

Modified: platform/store.rdbms/trunk/META-INF/MANIFEST.MF
===================================================================
--- platform/store.rdbms/trunk/META-INF/MANIFEST.MF	2013-06-12 17:12:10 UTC (rev 17546)
+++ platform/store.rdbms/trunk/META-INF/MANIFEST.MF	2013-06-12 17:39:15 UTC (rev 17547)
@@ -3,30 +3,30 @@
 Bundle-Name: DataNucleus RDBMS
 Bundle-SymbolicName: org.datanucleus.store.rdbms;singleton:=true
 Bundle-Vendor: DataNucleus
-Bundle-Version: 3.2.3
+Bundle-Version: 3.2.4
 Require-Bundle: org.datanucleus;bundle-version="3.2.4"
-Export-Package: org.datanucleus.store.rdbms;version="3.2.3",
- org.datanucleus.store.rdbms.adapter;version="3.2.3",
- org.datanucleus.store.rdbms.autostart;version="3.2.3",
- org.datanucleus.store.rdbms.datasource;version="3.2.3",
- org.datanucleus.store.rdbms.exceptions;version="3.2.3",
- org.datanucleus.store.rdbms.fieldmanager;version="3.2.3",
- org.datanucleus.store.rdbms.identifier;version="3.2.3",
- org.datanucleus.store.rdbms.key;version="3.2.3",
- org.datanucleus.store.rdbms.mapping;version="3.2.3",
- org.datanucleus.store.rdbms.mapping.datastore;version="3.2.3",
- org.datanucleus.store.rdbms.mapping.java;version="3.2.3",
- org.datanucleus.store.rdbms.mapping.oracle;version="3.2.3",
- org.datanucleus.store.rdbms.query;version="3.2.3",
- org.datanucleus.store.rdbms.request;version="3.2.3",
- org.datanucleus.store.rdbms.schema;version="3.2.3",
- org.datanucleus.store.rdbms.scostore;version="3.2.3",
- org.datanucleus.store.rdbms.sql;version="3.2.3",
- org.datanucleus.store.rdbms.sql.expression;version="3.2.3",
- org.datanucleus.store.rdbms.sql.method;version="3.2.3",
- org.datanucleus.store.rdbms.sql.operation;version="3.2.3",
- org.datanucleus.store.rdbms.table;version="3.2.3",
- org.datanucleus.store.rdbms.valuegenerator;version="3.2.3"
+Export-Package: org.datanucleus.store.rdbms;version="3.2.4",
+ org.datanucleus.store.rdbms.adapter;version="3.2.4",
+ org.datanucleus.store.rdbms.autostart;version="3.2.4",
+ org.datanucleus.store.rdbms.datasource;version="3.2.4",
+ org.datanucleus.store.rdbms.exceptions;version="3.2.4",
+ org.datanucleus.store.rdbms.fieldmanager;version="3.2.4",
+ org.datanucleus.store.rdbms.identifier;version="3.2.4",
+ org.datanucleus.store.rdbms.key;version="3.2.4",
+ org.datanucleus.store.rdbms.mapping;version="3.2.4",
+ org.datanucleus.store.rdbms.mapping.datastore;version="3.2.4",
+ org.datanucleus.store.rdbms.mapping.java;version="3.2.4",
+ org.datanucleus.store.rdbms.mapping.oracle;version="3.2.4",
+ org.datanucleus.store.rdbms.query;version="3.2.4",
+ org.datanucleus.store.rdbms.request;version="3.2.4",
+ org.datanucleus.store.rdbms.schema;version="3.2.4",
+ org.datanucleus.store.rdbms.scostore;version="3.2.4",
+ org.datanucleus.store.rdbms.sql;version="3.2.4",
+ org.datanucleus.store.rdbms.sql.expression;version="3.2.4",
+ org.datanucleus.store.rdbms.sql.method;version="3.2.4",
+ org.datanucleus.store.rdbms.sql.operation;version="3.2.4",
+ org.datanucleus.store.rdbms.table;version="3.2.4",
+ org.datanucleus.store.rdbms.valuegenerator;version="3.2.4"
 Import-Package: com.ibm.db2.jcc;resolution:=optional,
  com.informix.jdbc;resolution:=optional,
  com.jolbox.bonecp;resolution:=optional,

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/QueryToSQLMapper.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/QueryToSQLMapper.java	2013-06-12 17:12:10 UTC (rev 17546)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/QueryToSQLMapper.java	2013-06-12 17:39:15 UTC (rev 17547)
@@ -695,7 +695,7 @@
                         // Variable wasn't bound in the compilation so far, so handle as cross-join
                         processUnboundExpression((UnboundExpression) sqlExpr);
                         sqlExpr = stack.pop();
-                        NucleusLogger.QUERY.debug(">> QueryToSQL.exprResult variable was still unbound, so binding via cross-join");
+                        NucleusLogger.QUERY.debug("QueryToSQL.exprResult variable was still unbound, so binding via cross-join");
                     }
                     StatementMappingIndex idx = new StatementMappingIndex(sqlExpr.getJavaTypeMapping());
                     int[] cols = stmt.select(sqlExpr, alias);
@@ -1655,7 +1655,7 @@
                 org.datanucleus.store.rdbms.sql.SQLJoin.JoinType joinType = getRequiredJoinTypeForAlias(varName);
                 if (joinType != null)
                 {
-                    NucleusLogger.QUERY.debug(">> QueryToSQL.eq variable " + varName + " is mapped to table " + left.getSQLTable() +
+                    NucleusLogger.QUERY.debug("QueryToSQL.eq variable " + varName + " is mapped to table " + left.getSQLTable() +
                         " was previously bound as CROSS JOIN but changing to " + joinType);
                     String leftTblAlias = stmt.removeCrossJoin(left.getSQLTable());
                     if (joinType == org.datanucleus.store.rdbms.sql.SQLJoin.JoinType.LEFT_OUTER_JOIN)
@@ -1684,7 +1684,7 @@
                 org.datanucleus.store.rdbms.sql.SQLJoin.JoinType joinType = getRequiredJoinTypeForAlias(varName);
                 if (joinType != null)
                 {
-                    NucleusLogger.QUERY.debug(">> QueryToSQL.eq variable " + varName + " is mapped to table " + right.getSQLTable() +
+                    NucleusLogger.QUERY.debug("QueryToSQL.eq variable " + varName + " is mapped to table " + right.getSQLTable() +
                         " was previously bound as CROSS JOIN but changing to " + joinType);
                     String rightTblAlias = stmt.removeCrossJoin(right.getSQLTable());
                     if (joinType == org.datanucleus.store.rdbms.sql.SQLJoin.JoinType.LEFT_OUTER_JOIN)
@@ -3361,7 +3361,7 @@
         else
         {
             // Variable never met before, so return as UnboundExpression - process later if needing binding
-            NucleusLogger.QUERY.debug(">> QueryToSQL.processVariable (unbound) variable=" + varName +
+            NucleusLogger.QUERY.debug("QueryToSQL.processVariable (unbound) variable=" + varName +
                 " is not yet bound so returning UnboundExpression");
             UnboundExpression unbExpr = new UnboundExpression(stmt, varName);
             stack.push(unbExpr);
@@ -3589,7 +3589,7 @@
         }
         else
         {
-            NucleusLogger.QUERY.debug(">> QueryToSQL.bindVariable variable " + varName + 
+            NucleusLogger.QUERY.debug("QueryToSQL.bindVariable variable " + varName + 
                 " being bound to table=" + sqlTbl + " mapping=" + mapping);
         }
         m = new SQLTableMapping(sqlTbl, cmd, mapping);

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/sql/method/CollectionContainsMethod.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/sql/method/CollectionContainsMethod.java	2013-06-12 17:12:10 UTC (rev 17546)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/sql/method/CollectionContainsMethod.java	2013-06-12 17:39:15 UTC (rev 17547)
@@ -221,7 +221,7 @@
         {
             // TODO Check if *this* "contains" is negated, not just any of them (and remove above check)
             // TODO Check if any OR relates to the element expression (variable) only, if so then INNER JOIN
-            NucleusLogger.QUERY.debug(">> CollectionContains collExpr=" + collExpr + " elemExpr=" + elemExpr +
+            NucleusLogger.QUERY.debug(">> collection.contains collExpr=" + collExpr + " elemExpr=" + elemExpr +
                 " elem.variable=" + ((UnboundExpression)elemExpr).getVariableName() + 
                 " need to implement check on whether there is a !coll or an OR using just this variable");
         }
@@ -260,7 +260,7 @@
         if (elemIsUnbound)
         {
             varName = ((UnboundExpression)elemExpr).getVariableName();
-            NucleusLogger.QUERY.debug(">> collection.contains(" + elemExpr + ") binding unbound variable " + varName +
+            NucleusLogger.QUERY.debug("collection.contains(" + elemExpr + ") binding unbound variable " + varName +
                 " using INNER JOIN");
         }
         else if (!stmt.getQueryGenerator().hasExplicitJoins())
@@ -271,7 +271,7 @@
                 elemAlias = stmt.removeCrossJoin(elemExpr.getSQLTable());
                 elemIsUnbound = true;
                 elemType = elemExpr.getJavaTypeMapping().getType();
-                NucleusLogger.QUERY.debug(">> collection.contains(" + elemExpr +
+                NucleusLogger.QUERY.debug("collection.contains(" + elemExpr +
                     ") was previously bound as CROSS JOIN but changing to INNER JOIN");
             }
         }
@@ -461,7 +461,7 @@
         if (elemIsUnbound)
         {
             varName = ((UnboundExpression)elemExpr).getVariableName();
-            NucleusLogger.QUERY.debug(">> collection.contains(" + elemExpr + ") binding unbound variable " + varName +
+            NucleusLogger.QUERY.debug("collection.contains(" + elemExpr + ") binding unbound variable " + varName +
                 " using SUBQUERY");
         }
 

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/sql/method/MapContainsKeyMethod.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/sql/method/MapContainsKeyMethod.java	2013-06-12 17:12:10 UTC (rev 17546)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/sql/method/MapContainsKeyMethod.java	2013-06-12 17:39:15 UTC (rev 17547)
@@ -112,12 +112,12 @@
                 // TODO Check if *this* "containsKey" is negated, not any of them (and remove above check)
                 if (needsSubquery)
                 {
-                    NucleusLogger.QUERY.debug("MapContainsKey on " + mapExpr + "(" + keyExpr + ") using SUBQUERY");
+                    NucleusLogger.QUERY.debug("map.containsKey on " + mapExpr + "(" + keyExpr + ") using SUBQUERY");
                     return containsAsSubquery(mapExpr, keyExpr);
                 }
                 else
                 {
-                    NucleusLogger.QUERY.debug("MapContainsKey on " + mapExpr + "(" + keyExpr + ") using INNERJOIN");
+                    NucleusLogger.QUERY.debug("map.containsKey on " + mapExpr + "(" + keyExpr + ") using INNERJOIN");
                     return containsAsInnerJoin(mapExpr, keyExpr);
                 }
             }
@@ -169,7 +169,7 @@
         if (keyIsUnbound)
         {
             varName = ((UnboundExpression)keyExpr).getVariableName();
-            NucleusLogger.QUERY.debug(">> map.containsKey(" + keyExpr + ") binding unbound variable " + varName +
+            NucleusLogger.QUERY.debug("map.containsKey(" + keyExpr + ") binding unbound variable " + varName +
                 " using INNER JOIN");
             // TODO What if the variable is declared as a subtype, handle this see CollectionContainsMethod
         }
@@ -180,7 +180,7 @@
             {
                 keyAlias = stmt.removeCrossJoin(keyExpr.getSQLTable());
                 keyIsUnbound = true;
-                NucleusLogger.QUERY.debug(">> map.containsKey(" + keyExpr +
+                NucleusLogger.QUERY.debug("map.containsKey(" + keyExpr +
                     ") was previously bound as CROSS JOIN but changing to INNER JOIN");
             }
         }
@@ -360,7 +360,7 @@
         if (keyIsUnbound)
         {
             varName = ((UnboundExpression)keyExpr).getVariableName();
-            NucleusLogger.QUERY.debug(">> Map.containsKey binding unbound variable " + varName +
+            NucleusLogger.QUERY.debug("map.containsKey binding unbound variable " + varName +
                 " using SUBQUERY");
             // TODO What if the variable is declared as a subtype, handle this see CollectionContainsMethod
         }

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/sql/method/MapContainsValueMethod.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/sql/method/MapContainsValueMethod.java	2013-06-12 17:12:10 UTC (rev 17546)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/sql/method/MapContainsValueMethod.java	2013-06-12 17:39:15 UTC (rev 17547)
@@ -111,12 +111,12 @@
                 // TODO Check if *this* "containsValue" is negated, not any of them (and remove above check)
                 if (needsSubquery)
                 {
-                    NucleusLogger.QUERY.debug("MapContainsValue on " + mapExpr + "(" + valExpr + ") using SUBQUERY");
+                    NucleusLogger.QUERY.debug("map.containsValue on " + mapExpr + "(" + valExpr + ") using SUBQUERY");
                     return containsAsSubquery(mapExpr, valExpr);
                 }
                 else
                 {
-                    NucleusLogger.QUERY.debug("MapContainsValue on " + mapExpr + "(" + valExpr + ") using INNERJOIN");
+                    NucleusLogger.QUERY.debug("map.containsValue on " + mapExpr + "(" + valExpr + ") using INNERJOIN");
                     return containsAsInnerJoin(mapExpr, valExpr);
                 }
             }
@@ -168,7 +168,7 @@
         if (valIsUnbound)
         {
             varName = ((UnboundExpression)valExpr).getVariableName();
-            NucleusLogger.QUERY.debug(">> map.containsValue(" + valExpr + ") binding unbound variable " + varName +
+            NucleusLogger.QUERY.debug("map.containsValue(" + valExpr + ") binding unbound variable " + varName +
                 " using INNER JOIN");
             // TODO What if the variable is declared as a subtype, handle this see CollectionContainsMethod
         }
@@ -180,7 +180,7 @@
                 // Value is currently joined via CROSS JOIN, so remove it (and use INNER JOIN below)
                 valAlias = stmt.removeCrossJoin(valExpr.getSQLTable());
                 valIsUnbound = true;
-                NucleusLogger.QUERY.debug(">> map.containsValue(" + valExpr +
+                NucleusLogger.QUERY.debug("map.containsValue(" + valExpr +
                     ") was previously bound as CROSS JOIN but changing to INNER JOIN");
             }
 
@@ -363,7 +363,7 @@
         if (valIsUnbound)
         {
             varName = ((UnboundExpression)valExpr).getVariableName();
-            NucleusLogger.QUERY.debug(">> Map.containsValue binding unbound variable " + varName +
+            NucleusLogger.QUERY.debug("map.containsValue binding unbound variable " + varName +
                 " using SUBQUERY");
             // TODO What if the variable is declared as a subtype, handle this see CollectionContainsMethod
         }

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

[DataNucleus-commits] SF.net SVN: datanucleus:[17552] platform

From: <andy_jefferson@us...> - 2013-06-13 12:55

Revision: 17552
          http://sourceforge.net/p/datanucleus/code/17552
Author:   andy_jefferson
Date:     2013-06-13 12:55:06 +0000 (Thu, 13 Jun 2013)
Log Message:
-----------
[NUCJPA-238] Put storage in place so we know if a type has a converter for auto-apply. Will now need to update the store plugin(s) to make use of it

Modified Paths:
--------------
    platform/api.jpa/trunk/META-INF/MANIFEST.MF
    platform/api.jpa/trunk/pom.xml
    platform/api.jpa/trunk/src/java/org/datanucleus/api/jpa/metadata/JPAAnnotationReader.java
    platform/api.jpa/trunk/src/java/org/datanucleus/api/jpa/metadata/JPAMetaDataHandler.java
    platform/core/trunk/src/java/org/datanucleus/store/types/TypeManager.java

Modified: platform/api.jpa/trunk/META-INF/MANIFEST.MF
===================================================================
--- platform/api.jpa/trunk/META-INF/MANIFEST.MF	2013-06-13 10:26:19 UTC (rev 17551)
+++ platform/api.jpa/trunk/META-INF/MANIFEST.MF	2013-06-13 12:55:06 UTC (rev 17552)
@@ -3,7 +3,7 @@
 Bundle-Name: DataNucleus JPA API
 Bundle-SymbolicName: org.datanucleus.api.jpa;singleton:=true
 Bundle-Version: 3.3.0.m1
-Require-Bundle: org.datanucleus;bundle-version="3.2.4"
+Require-Bundle: org.datanucleus;bundle-version="3.2.5"
 Bundle-Vendor: DataNucleus
 Import-Package: javax.jdo;version="3.0.0",
  javax.jdo.annotations;version="3.0.0",

Modified: platform/api.jpa/trunk/pom.xml
===================================================================
--- platform/api.jpa/trunk/pom.xml	2013-06-13 10:26:19 UTC (rev 17551)
+++ platform/api.jpa/trunk/pom.xml	2013-06-13 12:55:06 UTC (rev 17552)
@@ -71,7 +71,7 @@
         <dependency>
             <groupId>org.datanucleus</groupId>
             <artifactId>datanucleus-core</artifactId>
-            <version>[3.2.4, )</version>
+            <version>[3.2.5-SNAPSHOT, )</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

Modified: platform/api.jpa/trunk/src/java/org/datanucleus/api/jpa/metadata/JPAAnnotationReader.java
===================================================================
--- platform/api.jpa/trunk/src/java/org/datanucleus/api/jpa/metadata/JPAAnnotationReader.java	2013-06-13 10:26:19 UTC (rev 17551)
+++ platform/api.jpa/trunk/src/java/org/datanucleus/api/jpa/metadata/JPAAnnotationReader.java	2013-06-13 12:55:06 UTC (rev 17552)
@@ -3184,12 +3184,6 @@
             {
                 HashMap<String, Object> annotationValues = annotations[i].getNameValueMap();
                 boolean autoApply = (Boolean) annotationValues.get("autoApply");
-                if (autoApply)
-                {
-                    // TODO Make use of auto-apply
-                    NucleusLogger.METADATA.warn("TODO Currently ignoring Converter autoApply setting (" + 
-                            autoApply + ") for " + cls.getName() + "; not yet supported");
-                }
                 TypeManager typeMgr = mgr.getNucleusContext().getTypeManager();
                 if (typeMgr.getTypeConverterForName(cls.getName()) == null)
                 {
@@ -3232,7 +3226,7 @@
 
                     // Register the TypeConverter under the name of the AttributeConverter class
                     TypeConverter conv = new JPATypeConverter(entityConv, javaType, dbType);
-                    typeMgr.registerConverter(cls.getName(), conv);
+                    typeMgr.registerConverter(cls.getName(), conv, autoApply);
                 }
                 return true;
             }

Modified: platform/api.jpa/trunk/src/java/org/datanucleus/api/jpa/metadata/JPAMetaDataHandler.java
===================================================================
--- platform/api.jpa/trunk/src/java/org/datanucleus/api/jpa/metadata/JPAMetaDataHandler.java	2013-06-13 10:26:19 UTC (rev 17551)
+++ platform/api.jpa/trunk/src/java/org/datanucleus/api/jpa/metadata/JPAMetaDataHandler.java	2013-06-13 12:55:06 UTC (rev 17552)
@@ -1058,7 +1058,7 @@
             else if (localName.equals("converter"))
             {
                 String converterClassName = getAttr(attrs, "class");
-                String autoApply = getAttr(attrs, "auto-apply");
+                Boolean autoApply = Boolean.valueOf(getAttr(attrs, "auto-apply"));
                 TypeManager typeMgr = mgr.getNucleusContext().getTypeManager();
                 if (typeMgr.getTypeConverterForName(converterClassName) == null)
                 {
@@ -1104,11 +1104,8 @@
 
                     // Register the TypeConverter under the name of the AttributeConverter class
                     TypeConverter conv = new JPATypeConverter(entityConv, javaType, dbType);
-                    typeMgr.registerConverter(converterCls.getName(), conv);
+                    typeMgr.registerConverter(converterCls.getName(), conv, autoApply);
                 }
-                // TODO Make use of auto-apply
-                NucleusLogger.METADATA.warn("TODO Currently ignoring Converter autoApply setting (" + 
-                    autoApply + ") for " + converterClassName + "; not yet supported");
             }
             else if (localName.equals("lob"))
             {

Modified: platform/core/trunk/src/java/org/datanucleus/store/types/TypeManager.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/types/TypeManager.java	2013-06-13 10:26:19 UTC (rev 17551)
+++ platform/core/trunk/src/java/org/datanucleus/store/types/TypeManager.java	2013-06-13 12:55:06 UTC (rev 17552)
@@ -61,6 +61,8 @@
     /** Map of TypeConverter keyed by their symbolic name. */
     Map<String, TypeConverter> convertersByName = null;
 
+    Map<Class, TypeConverter> autoApplyConvertersByType = null;
+
     /** Map of (Map of TypeConverter keyed by the datastore type), keyed by the member type. */
     Map<Class, Map<Class, TypeConverter>> typeConverterMap = null;
 
@@ -391,6 +393,21 @@
     }
 
     /**
+     * Register a TypeConverter with the TypeManager process.
+     * @param name The name to register the converter under
+     * @param converter The converter
+     * @param autoApply Whether this should be used as an auto-apply converter
+     */
+    public void registerConverter(String name, TypeConverter converter, boolean autoApply)
+    {
+        if (convertersByName == null)
+        {
+            convertersByName = new HashMap<String, TypeConverter>();
+        }
+        convertersByName.put(name, converter);
+    }
+
+    /**
      * TypeConverters are registered either from the contents of "plugin.xml" (i.e the builtin types) where the
      * name is of the form "dn.*", or from user-registered metadata (e.g JPA Annotations) where the name is
      * the class name of the converter.
@@ -399,11 +416,16 @@
      */
     public void registerConverter(String name, TypeConverter converter)
     {
-        if (convertersByName == null)
+        registerConverter(name, converter, false);
+    }
+
+    public TypeConverter getAutoApplyTypeConverterFortype(Class memberType)
+    {
+        if (autoApplyConvertersByType == null)
         {
-            convertersByName = new HashMap<String, TypeConverter>();
+            return null;
         }
-        convertersByName.put(name, converter);
+        return autoApplyConvertersByType.get(memberType);
     }
 
     /**

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

[DataNucleus-commits] SF.net SVN: datanucleus:[17559] platform

From: <andy_jefferson@us...> - 2013-06-14 07:24

Revision: 17559
          http://sourceforge.net/p/datanucleus/code/17559
Author:   andy_jefferson
Date:     2013-06-14 07:24:12 +0000 (Fri, 14 Jun 2013)
Log Message:
-----------
include JPA 2.1 XSD location

Modified Paths:
--------------
    platform/api.jpa/trunk/plugin.xml
    platform/core/trunk/plugin.xml

Modified: platform/api.jpa/trunk/plugin.xml
===================================================================
--- platform/api.jpa/trunk/plugin.xml	2013-06-14 07:16:14 UTC (rev 17558)
+++ platform/api.jpa/trunk/plugin.xml	2013-06-14 07:24:12 UTC (rev 17559)
@@ -126,6 +126,8 @@
              type="SYSTEM" url="/org/datanucleus/api/jpa/jpa_orm_2_0.xsd"/>
         <entityresolver identity="http://java.sun.com/xml/ns/persistence/orm_2_1.xsd"
              type="SYSTEM" url="/org/datanucleus/api/jpa/jpa_orm_2_1.xsd"/>
+        <entityresolver identity="http://xmlns.jcp.org/xml/ns/persistence/orm_2_1.xsd"
+             type="SYSTEM" url="/org/datanucleus/api/jpa/jpa_orm_2_1.xsd"/>
         <entityresolver url="/org/datanucleus/api/jpa/jpa_orm_1_0.xsd"/>
         <entityresolver url="/org/datanucleus/api/jpa/jpa_orm_2_0.xsd"/>
         <entityresolver url="/org/datanucleus/api/jpa/jpa_orm_2_1.xsd"/>

Modified: platform/core/trunk/plugin.xml
===================================================================
--- platform/core/trunk/plugin.xml	2013-06-14 07:16:14 UTC (rev 17558)
+++ platform/core/trunk/plugin.xml	2013-06-14 07:24:12 UTC (rev 17559)
@@ -516,6 +516,8 @@
              type="SYSTEM" url="/org/datanucleus/metadata/persistence_2_0.xsd"/>
        <entityresolver identity="http://java.sun.com/xml/ns/persistence/persistence_2_1.xsd"
              type="SYSTEM" url="/org/datanucleus/metadata/persistence_2_1.xsd"/>
+       <entityresolver identity="http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd"
+             type="SYSTEM" url="/org/datanucleus/metadata/persistence_2_1.xsd"/>
        <entityresolver url="/org/datanucleus/metadata/persistence_2_0.xsd"/>
     </extension>
 

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

[DataNucleus-commits] SF.net SVN: datanucleus:[17571] platform

From: <andy_jefferson@us...> - 2013-06-15 09:22

Revision: 17571
          http://sourceforge.net/p/datanucleus/code/17571
Author:   andy_jefferson
Date:     2013-06-15 09:22:54 +0000 (Sat, 15 Jun 2013)
Log Message:
-----------
Move some resource messages to RDBMS plugin (where they were used) and remove MappingFactory since called from very few places. Add TODO for TypeConverter autoApply

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/Localisation.properties
    platform/core/trunk/src/java/org/datanucleus/Localisation_es.properties
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/Localisation.properties
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/Localisation_es.properties
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/RDBMSMappingManager.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/java/DatastoreMappingFactory.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/java/JavaTypeMapping.java

Removed Paths:
-------------
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/MappingFactory.java

Modified: platform/core/trunk/src/java/org/datanucleus/Localisation.properties
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/Localisation.properties	2013-06-14 17:44:37 UTC (rev 17570)
+++ platform/core/trunk/src/java/org/datanucleus/Localisation.properties	2013-06-15 09:22:54 UTC (rev 17571)
@@ -763,15 +763,6 @@
 #
 # Mapping
 #
-041002=The field "{0}" of Java type {1} while specified as "embedded" has no known mapping class available in DataNucleus.
-041003=The field "{0}" is specified as an embedded Collection/Map, but DataNucleus doesnt yet support embedded Collections/Maps.
-
-041006=Constructor ({0},{1}) not found for Mapping type {2}
-041007=Constructor ({0},{1},{2}) not found for Mapping type {3}
-041008=Constructor ({0},{1},{2},{3}) not found for Mapping type {4}
-041009=Failed to generate new Mapping of type {0}, exception : {1}
-041010=Failed to generate new Mapping of type {0} for table {1}, field {2}, exception : {3}
-
 041017=Can't set Application ID parameter. Parameter = {0}
 
 041019=Object "{0}" has bidirectional field "{1}" currently set to "{2}" but this object is being deleted so nulling this field

Modified: platform/core/trunk/src/java/org/datanucleus/Localisation_es.properties
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/Localisation_es.properties	2013-06-14 17:44:37 UTC (rev 17570)
+++ platform/core/trunk/src/java/org/datanucleus/Localisation_es.properties	2013-06-15 09:22:54 UTC (rev 17571)
@@ -771,15 +771,6 @@
 #
 # Mapping
 #
-041002=El camp "{0}" con tipo de Java {1} que es "embedded" no tiene una clase disponible para convertirlo en DataNucleus.
-041003=El campo "{0}" es una Collecci\xF3n o Mapa "embedded", pero DataNucleus no lo apoya.
-
-
-041006=El Constructor ({0},{1}) no existe por el tipo de Mapping {2}
-041007=El Constructor ({0},{1},{2}) no existe por el tipo de Mapping {3}
-041009=La generaci\xF3n del nuevo tipo de Mapping {0} ha fallada : {1}
-041010=La generaci\xF3n del nuevo tipo de Mapping {0} por la tabla {1}, field {2} ha fallada : {3}
-
 041017=No es posible fijar la identidad de Application. Par\xE1metro = {0}
 041021=El objeto "{0}" tiene campo "{1}" con relacion bidirectional N-1 a "{2}" pero la collecci\xF3n "{3}" no contiene este objeto; lo vamos a a\xF1adir
 

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/Localisation.properties
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/Localisation.properties	2013-06-14 17:44:37 UTC (rev 17570)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/Localisation.properties	2013-06-15 09:22:54 UTC (rev 17571)
@@ -86,7 +86,11 @@
 
 041004=Somehow {0}.{1}() was called, which should have been impossible!
 041005=Somehow {0}.{1}() was called on the mapping for field="{2}", which should have been impossible!
-
+041006=Constructor ({0},{1}) not found for Mapping type {2}
+041007=Constructor ({0},{1},{2}) not found for Mapping type {3}
+041008=Constructor ({0},{1},{2},{3}) not found for Mapping type {4}
+041009=Failed to generate new Mapping of type {0}, exception : {1}
+041010=Failed to generate new Mapping of type {0} for table {1}, field {2}, exception : {3}
 041011=Missing constructor {0}(ClassTable, int)
 041012={0} can only be used with a persistence-capable field
 041013=The plugin.xml has specified a datastore-mapping class of "{0}" yet this is not found

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/Localisation_es.properties
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/Localisation_es.properties	2013-06-14 17:44:37 UTC (rev 17570)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/Localisation_es.properties	2013-06-15 09:22:54 UTC (rev 17571)
@@ -86,7 +86,11 @@
 
 041004=De alguna manera {0}.{1}() estaba llamado, pero debiera ser imposible
 041005=De alguna manera {0}.{1}() del mapping del campo "{2}" estaba llamado, pero debiera ser imposible
+041006=El Constructor ({0},{1}) no existe por el tipo de Mapping {2}
+041007=El Constructor ({0},{1},{2}) no existe por el tipo de Mapping {3}
 
+041009=La generaci\xF3n del nuevo tipo de Mapping {0} ha fallada : {1}
+041010=La generaci\xF3n del nuevo tipo de Mapping {0} por la tabla {1}, field {2} ha fallada : {3}
 041011=Constructor {0}(ClassTable, int) no existe
 041012=Puede usa {0} con un campo persistence-capable solamente
 041013=El fichero plugin.xml tiene una clase de datastore-mapping de "{0}" pero no la existe

Deleted: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/MappingFactory.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/MappingFactory.java	2013-06-14 17:44:37 UTC (rev 17570)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/MappingFactory.java	2013-06-15 09:22:54 UTC (rev 17571)
@@ -1,101 +0,0 @@
-/**********************************************************************
-Copyright (c) 2003 Erik Bengtson and others. All rights reserved. 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
- 
-
-Contributors:
-2003 Andy Jefferson - converted to use Reflection
-2004 Andy Jefferson - output targetException when Invocation error
-    ...
-**********************************************************************/
-package org.datanucleus.store.rdbms.mapping;
-
-import org.datanucleus.ClassLoaderResolver;
-import org.datanucleus.exceptions.NucleusException;
-import org.datanucleus.metadata.AbstractMemberMetaData;
-import org.datanucleus.store.rdbms.adapter.DatastoreAdapter;
-import org.datanucleus.store.rdbms.mapping.java.JavaTypeMapping;
-import org.datanucleus.store.rdbms.table.Table;
-import org.datanucleus.store.rdbms.RDBMSStoreManager;
-import org.datanucleus.util.Localiser;
-
-/**
- * Factory class for creating Mapping instances.
- * This is called to generate field mappings for the classes to be persisted.
- */
-public final class MappingFactory
-{
-    private static final Localiser LOCALISER = Localiser.getInstance(
-        "org.datanucleus.Localisation", org.datanucleus.ClassConstants.NUCLEUS_CONTEXT_LOADER);
-
-    /** Private constructor to prevent instantiation. */
-    private MappingFactory()
-    {
-    }
-
-    /**
-     * Get a new instance of the Mapping using the StoreManager and type.
-     * This creates a mapping that doesn't have its field/table set and typically used to represent a
-     * parameter in a query.
-     * @param mappingClass the Mapping class to be created
-     * @param storeMgr The StoreManager
-     * @param type The type
-     * @return The Mapping
-     */
-    public static JavaTypeMapping createMapping(Class mappingClass, RDBMSStoreManager storeMgr, String type)
-    {
-    	JavaTypeMapping mapping = null;
-        try
-        {
-        	mapping = (JavaTypeMapping)mappingClass.newInstance();
-        }
-        catch (Exception e)
-        {
-            throw new NucleusException(LOCALISER.msg("041009", mappingClass.getName(), e), e).setFatal();
-        }
-        mapping.initialize(storeMgr, type);
-        return mapping;
-    }
-
-    /**
-     * Get a new instance of the Mapping providing full field/property details and the role of this
-     * mapping within that field.
-     * @param mappingClass the Mapping class to be created
-     * @param dba Datastore Adapter
-     * @param mmd MetaData for the field/property to be mapped
-     * @param table The Table
-     * @param clr The ClassLoaderResolver
-     * @return The Mapping
-     */
-    public static JavaTypeMapping createMapping(Class mappingClass, DatastoreAdapter dba, 
-            AbstractMemberMetaData mmd, int roleForField, Table table, ClassLoaderResolver clr)
-    {
-        JavaTypeMapping mapping = null;
-        try
-        {
-        	mapping = (JavaTypeMapping)mappingClass.newInstance();
-        }
-        catch (Exception e)
-        {
-            throw new NucleusException(LOCALISER.msg("041009", mappingClass.getName(), e), e).setFatal();
-        }
-
-        if (roleForField >= 0)
-        {
-            mapping.setRoleForMember(roleForField);
-        }
-        mapping.initialize(mmd, table, clr);
-
-        return mapping;
-    }
-}
\ No newline at end of file

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/RDBMSMappingManager.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/RDBMSMappingManager.java	2013-06-14 17:44:37 UTC (rev 17570)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/RDBMSMappingManager.java	2013-06-15 09:22:54 UTC (rev 17571)
@@ -41,7 +41,6 @@
 import org.datanucleus.metadata.RelationType;
 import org.datanucleus.plugin.ConfigurationElement;
 import org.datanucleus.plugin.PluginManager;
-import org.datanucleus.store.rdbms.adapter.DatastoreAdapter;
 import org.datanucleus.store.rdbms.exceptions.NoTableManagedException;
 import org.datanucleus.store.rdbms.identifier.DatastoreIdentifier;
 import org.datanucleus.store.rdbms.identifier.IdentifierFactory;
@@ -81,22 +80,21 @@
 
 /**
  * Mapping manager for RDBMS datastores.
- * Provides mappings from standard Java types defined in org.datanucleus.store.rdbms.mapping to
- * datastore mappings for JDBC types.
+ * Provides mappings from standard Java types (defined in org.datanucleus.store.rdbms.mapping.java) to
+ * datastore mappings for JDBC types (defined in org.datanucleus.store.rdbms.mapping.datastore).
  */
 public class RDBMSMappingManager implements MappingManager
 {
     protected static final Localiser LOCALISER_RDBMS = Localiser.getInstance("org.datanucleus.store.rdbms.Localisation",
         RDBMSStoreManager.class.getClassLoader());
 
-    /** Store Manager that this relates to. */
     protected final RDBMSStoreManager storeMgr;
 
-    final ClassLoaderResolver clr;
+    protected final ClassLoaderResolver clr;
 
-    MultiMap datastoreMappingsByJavaType;
-    MultiMap datastoreMappingsByJDBCType;
-    MultiMap datastoreMappingsBySQLType;
+    protected MultiMap datastoreMappingsByJavaType;
+    protected MultiMap datastoreMappingsByJDBCType;
+    protected MultiMap datastoreMappingsBySQLType;
 
     /**
      * Constructor for a mapping manager for an RDBMS datastore.
@@ -235,13 +233,16 @@
             // Doesn't allow for whether a field is serialised/embedded so they get the default mapping only
             Class mc = getMappingClass(c, serialised, embedded, null);
             mc = getOverrideMappingClass(mc, null, -1); // Allow for overriding in subclasses
-            JavaTypeMapping m = MappingFactory.createMapping(mc, storeMgr, c.getName());
-            if (m == null)
+            JavaTypeMapping m = null;
+            try
             {
-                String name = mc.getName();
-                name = name.substring(name.lastIndexOf('.') + 1);
-                throw new NucleusUserException(LOCALISER_RDBMS.msg("041012", name));
+                m = (JavaTypeMapping)mc.newInstance();
             }
+            catch (Exception e)
+            {
+                throw new NucleusException(LOCALISER_RDBMS.msg("041009", mc.getName(), e), e).setFatal();
+            }
+            m.initialize(storeMgr, c.getName());
             if (m.hasSimpleDatastoreRepresentation())
             {
                 // Create the datastore mapping (NOT the column)
@@ -279,37 +280,38 @@
         Class mc = getMappingClass(c, serialised, embedded, fieldName);
         mc = getOverrideMappingClass(mc, null, -1); // Allow for overriding in subclasses
 
-        JavaTypeMapping m = MappingFactory.createMapping(mc, storeMgr, c.getName());
-        if (m == null)
+        JavaTypeMapping m = null;
+        try
         {
-            String name = mc.getName();
-            name = name.substring(name.lastIndexOf('.') + 1);
-            throw new NucleusUserException(LOCALISER_RDBMS.msg("041012",name));
+            m = (JavaTypeMapping)mc.newInstance();
         }
+        catch (Exception e)
+        {
+            throw new NucleusException(LOCALISER_RDBMS.msg("041009", mc.getName(), e), e).setFatal();
+        }
+        m.initialize(storeMgr, c.getName());
         return m;
     }
 
     /**
      * Accessor for the mapping for the field of the specified table.
      * Can be used for fields of a class, elements of a collection of a class, elements of an array of
-     * a class, keys of a map of a class, values of a map of a class. This is controlled by the role
-     * argument.
+     * a class, keys of a map of a class, values of a map of a class; this is controlled by the role argument.
+     * @param table Table to add the mapping to
+     * @param mmd MetaData for the member to map
      * @param clr The ClassLoaderResolver
      * @param fieldRole Role that this mapping plays for the field
-     * @param datastoreContainer Table to add the mapping to
-     * @param mmd MetaData for the member to map
      * @return The mapping for the member.
      */
-    public JavaTypeMapping getMapping(Table datastoreContainer,
-            AbstractMemberMetaData mmd, ClassLoaderResolver clr, int fieldRole)
+    public JavaTypeMapping getMapping(Table table, AbstractMemberMetaData mmd, ClassLoaderResolver clr, int fieldRole)
     {
         Class mc = null;
-        DatastoreAdapter dba = datastoreContainer.getStoreManager().getDatastoreAdapter();
 
+        // TODO Check if this java type has an autoApply typeConverter [NUCRDBMS-679]
         AbstractMemberMetaData overrideMmd = null;
         if (mmd.getTypeConverterName() != null)
         {
-            TypeManager typeMgr = datastoreContainer.getStoreManager().getNucleusContext().getTypeManager();
+            TypeManager typeMgr = table.getStoreManager().getNucleusContext().getTypeManager();
             TypeConverter conv = typeMgr.getTypeConverterForName(mmd.getTypeConverterName());
             if (TypeManager.getDatastoreTypeForTypeConverter(conv, mmd.getType()) == String.class)
             {
@@ -328,17 +330,17 @@
         else if (fieldRole == FieldRole.ROLE_COLLECTION_ELEMENT || fieldRole == FieldRole.ROLE_ARRAY_ELEMENT)
         {
             // Mapping a collection/array element (in a join table)
-            mc = getElementMappingClass(datastoreContainer, mmd, dba, clr);
+            mc = getElementMappingClass(table, mmd, clr);
         }
         else if (fieldRole == FieldRole.ROLE_MAP_KEY)
         {
             // Mapping a map key (in a join table)
-            mc = getKeyMappingClass(datastoreContainer, mmd, dba, clr);
+            mc = getKeyMappingClass(table, mmd, clr);
         }
         else if (fieldRole == FieldRole.ROLE_MAP_VALUE)
         {
             // Mapping a map value (in a join table)
-            mc = getValueMappingClass(datastoreContainer, mmd, dba, clr);
+            mc = getValueMappingClass(table, mmd, clr);
         }
         else
         {
@@ -399,7 +401,7 @@
                     {
                         // See NUCCORE-697 - always need to use the real member metadata for the mapping
                         // so that it can find sub-fields when persisting/querying etc
-                        AbstractClassMetaData cmdForFmd = datastoreContainer.getStoreManager().getMetaDataManager().getMetaDataForClass(mmd.getClassName(), clr);
+                        AbstractClassMetaData cmdForFmd = table.getStoreManager().getMetaDataManager().getMetaDataForClass(mmd.getClassName(), clr);
                         overrideMmd = cmdForFmd.getMetaDataForMember(mmd.getName());
                     }
                 }
@@ -408,13 +410,23 @@
         mc = getOverrideMappingClass(mc, mmd, fieldRole); // Allow for overriding in subclasses
 
         // Create the mapping of the selected type
-        JavaTypeMapping m = MappingFactory.createMapping(mc, dba, mmd, fieldRole, datastoreContainer, clr);
-        if (m == null)
+        JavaTypeMapping m = null;
+        try
         {
-            throw new NucleusException(LOCALISER_RDBMS.msg("041011", mc.getName())).setFatal();
+            m = (JavaTypeMapping)mc.newInstance();
         }
+        catch (Exception e)
+        {
+            throw new NucleusException(LOCALISER_RDBMS.msg("041009", mc.getName(), e), e).setFatal();
+        }
+        if (fieldRole >= 0)
+        {
+            m.setRoleForMember(fieldRole);
+        }
+        m.initialize(mmd, table, clr);
         if (overrideMmd != null)
         {
+            // Note cannot just use this overrideMmd in the initialize(...) call above, a test fails.
             m.setMemberMetaData(overrideMmd);
         }
 
@@ -424,11 +436,11 @@
     /**
      * Convenience method to allow overriding of particular mapping classes.
      * @param mappingClass The mapping class selected
-     * @param fmd Field meta data for the field (if appropriate)
+     * @param mmd Meta data for the member (if appropriate)
      * @param fieldRole Role for the field (e.g collection element)
      * @return The mapping class to use
      */
-    protected Class getOverrideMappingClass(Class mappingClass, AbstractMemberMetaData fmd, int fieldRole)
+    protected Class getOverrideMappingClass(Class mappingClass, AbstractMemberMetaData mmd, int fieldRole)
     {
         return mappingClass;
     }
@@ -576,12 +588,10 @@
      * join table.
      * @param table The table
      * @param mmd MetaData for the collection field/property containing the collection/array of PCs
-     * @param dba Database adapter
      * @param clr ClassLoader resolver
      * @return The mapping class
      */
-    protected Class getElementMappingClass(Table table, 
-            AbstractMemberMetaData mmd, DatastoreAdapter dba, ClassLoaderResolver clr)
+    protected Class getElementMappingClass(Table table, AbstractMemberMetaData mmd, ClassLoaderResolver clr)
     {
         if (!mmd.hasCollection() && !mmd.hasArray())
         {
@@ -710,12 +720,10 @@
      * Currently only used where the keys are either serialised or embedded into a join table.
      * @param table The container
      * @param mmd MetaData for the field containing the map that this key is for
-     * @param dba Database adapter
      * @param clr ClassLoader resolver
      * @return The mapping class
      */
-    protected Class getKeyMappingClass(Table table,AbstractMemberMetaData mmd, DatastoreAdapter dba,
-            ClassLoaderResolver clr)
+    protected Class getKeyMappingClass(Table table, AbstractMemberMetaData mmd, ClassLoaderResolver clr)
     {
         if (mmd.getMap() == null)
         {
@@ -803,12 +811,10 @@
      * Currently only used where the value are either serialised or embedded into a join table.
      * @param table The container
      * @param mmd MetaData for the field/property containing the map that this value is for
-     * @param dba Database adapter
      * @param clr ClassLoader resolver
      * @return The mapping class
      */
-    protected Class getValueMappingClass(Table table, AbstractMemberMetaData mmd, DatastoreAdapter dba, 
-            ClassLoaderResolver clr)
+    protected Class getValueMappingClass(Table table, AbstractMemberMetaData mmd, ClassLoaderResolver clr)
     {
         if (mmd.getMap() == null)
         {

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/java/DatastoreMappingFactory.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/java/DatastoreMappingFactory.java	2013-06-14 17:44:37 UTC (rev 17570)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/java/DatastoreMappingFactory.java	2013-06-15 09:22:54 UTC (rev 17571)
@@ -37,7 +37,7 @@
 public final class DatastoreMappingFactory
 {
     private static final Localiser LOCALISER=Localiser.getInstance(
-        "org.datanucleus.Localisation", org.datanucleus.ClassConstants.NUCLEUS_CONTEXT_LOADER);
+        "org.datanucleus.store.rdbms.Localisation", RDBMSStoreManager.class.getClassLoader());
 
     /** Private constructor to prevent instantiation. */
     private DatastoreMappingFactory()

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/java/JavaTypeMapping.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/java/JavaTypeMapping.java	2013-06-14 17:44:37 UTC (rev 17570)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/java/JavaTypeMapping.java	2013-06-15 09:22:54 UTC (rev 17571)
@@ -103,7 +103,6 @@
      * Subclasses should override this method to perform any datastore initialization operations.
      * @param storeMgr The Datastore Adapter that this Mapping should use.
      * @param type The Class that this mapping maps to the database.
-     * @see org.datanucleus.store.rdbms.mapping.MappingFactory#createMapping(Class, RDBMSStoreManager, String)
      */
     public void initialize(RDBMSStoreManager storeMgr, String type)
     {

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

[DataNucleus-commits] SF.net SVN: datanucleus:[17576] platform

From: <andy_jefferson@us...> - 2013-06-15 15:39

Revision: 17576
          http://sourceforge.net/p/datanucleus/code/17576
Author:   andy_jefferson
Date:     2013-06-15 15:39:05 +0000 (Sat, 15 Jun 2013)
Log Message:
-----------
When we register a typeConverter as autoApply, pass in the type name to register it against

Modified Paths:
--------------
    platform/api.jpa/trunk/plugin.xml
    platform/api.jpa/trunk/src/java/org/datanucleus/api/jpa/metadata/JPAAnnotationReader.java
    platform/api.jpa/trunk/src/java/org/datanucleus/api/jpa/metadata/JPAMetaDataHandler.java
    platform/core/trunk/src/java/org/datanucleus/store/types/TypeManager.java

Modified: platform/api.jpa/trunk/plugin.xml
===================================================================
--- platform/api.jpa/trunk/plugin.xml	2013-06-15 15:00:33 UTC (rev 17575)
+++ platform/api.jpa/trunk/plugin.xml	2013-06-15 15:39:05 UTC (rev 17576)
@@ -95,6 +95,7 @@
         <annotations annotation-class="javax.persistence.NamedStoredProcedureQuery" reader="org.datanucleus.api.jpa.metadata.JPAAnnotationReader"/>
         <annotations annotation-class="javax.persistence.NamedStoredProcedureQueries" reader="org.datanucleus.api.jpa.metadata.JPAAnnotationReader"/>
         <annotations annotation-class="org.datanucleus.api.jpa.annotations.PersistenceAware" reader="org.datanucleus.api.jpa.metadata.JPAAnnotationReader"/>
+        <annotations annotation-class="javax.persistence.Converter" reader="org.datanucleus.api.jpa.metadata.JPAAnnotationReader"/>
     </extension>
 
     <!-- CALLBACK HANDLER -->

Modified: platform/api.jpa/trunk/src/java/org/datanucleus/api/jpa/metadata/JPAAnnotationReader.java
===================================================================
--- platform/api.jpa/trunk/src/java/org/datanucleus/api/jpa/metadata/JPAAnnotationReader.java	2013-06-15 15:00:33 UTC (rev 17575)
+++ platform/api.jpa/trunk/src/java/org/datanucleus/api/jpa/metadata/JPAAnnotationReader.java	2013-06-15 15:39:05 UTC (rev 17576)
@@ -3226,7 +3226,7 @@
 
                     // Register the TypeConverter under the name of the AttributeConverter class
                     TypeConverter conv = new JPATypeConverter(entityConv, javaType, dbType);
-                    typeMgr.registerConverter(cls.getName(), conv, autoApply);
+                    typeMgr.registerConverter(cls.getName(), conv, autoApply, javaType.getName());
                 }
                 return true;
             }

Modified: platform/api.jpa/trunk/src/java/org/datanucleus/api/jpa/metadata/JPAMetaDataHandler.java
===================================================================
--- platform/api.jpa/trunk/src/java/org/datanucleus/api/jpa/metadata/JPAMetaDataHandler.java	2013-06-15 15:00:33 UTC (rev 17575)
+++ platform/api.jpa/trunk/src/java/org/datanucleus/api/jpa/metadata/JPAMetaDataHandler.java	2013-06-15 15:39:05 UTC (rev 17576)
@@ -1104,7 +1104,7 @@
 
                     // Register the TypeConverter under the name of the AttributeConverter class
                     TypeConverter conv = new JPATypeConverter(entityConv, javaType, dbType);
-                    typeMgr.registerConverter(converterCls.getName(), conv, autoApply);
+                    typeMgr.registerConverter(converterCls.getName(), conv, autoApply, javaType.getName());
                 }
             }
             else if (localName.equals("lob"))

Modified: platform/core/trunk/src/java/org/datanucleus/store/types/TypeManager.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/types/TypeManager.java	2013-06-15 15:00:33 UTC (rev 17575)
+++ platform/core/trunk/src/java/org/datanucleus/store/types/TypeManager.java	2013-06-15 15:39:05 UTC (rev 17576)
@@ -398,7 +398,7 @@
      * @param converter The converter
      * @param autoApply Whether this should be used as an auto-apply converter
      */
-    public void registerConverter(String name, TypeConverter converter, boolean autoApply)
+    public void registerConverter(String name, TypeConverter converter, boolean autoApply, String autoApplyType)
     {
         if (convertersByName == null)
         {
@@ -411,7 +411,7 @@
             {
                 autoApplyConvertersByType = new HashMap<String, TypeConverter>();
             }
-            autoApplyConvertersByType.put(name, converter);
+            autoApplyConvertersByType.put(autoApplyType, converter);
         }
     }
 
@@ -424,7 +424,7 @@
      */
     public void registerConverter(String name, TypeConverter converter)
     {
-        registerConverter(name, converter, false);
+        registerConverter(name, converter, false, null);
     }
 
     public TypeConverter getAutoApplyTypeConverterFortype(Class memberType)

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

Next Messages