DataNucleus

Revision: 2884
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=2884&view=rev
Author:   andy_jefferson
Date:     2008-08-27 07:01:14 +0000 (Wed, 27 Aug 2008)

Log Message:
-----------
Fix jar contents, and deps

Modified Paths:
--------------
    tools/springframework/trunk/pom.xml
    tools/springframework/trunk/project.properties
    tools/springframework/trunk/project.xml

Modified: tools/springframework/trunk/pom.xml
===================================================================
--- tools/springframework/trunk/pom.xml	2008-08-27 06:55:41 UTC (rev 2883)
+++ tools/springframework/trunk/pom.xml	2008-08-27 07:01:14 UTC (rev 2884)
@@ -35,23 +35,9 @@
             <artifactId>spring</artifactId>
             <version>2.0</version>
         </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>[1.2, 1.3)</version>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>3.8.1</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>
         <sourceDirectory>src/java</sourceDirectory>
-        <outputDirectory>bin</outputDirectory>
 	</build>
 </project>

Modified: tools/springframework/trunk/project.properties
===================================================================
--- tools/springframework/trunk/project.properties	2008-08-27 06:55:41 UTC (rev 2883)
+++ tools/springframework/trunk/project.properties	2008-08-27 07:01:14 UTC (rev 2884)
@@ -14,6 +14,8 @@
 maven.compile.optimize=on
 maven.compile.verbose=off
 maven.compile.encoding=iso8859-1
+maven.compile.target=1.3
+maven.compile.source=1.3
 
 maven.jar.manifest=${basedir}/META-INF/MANIFEST.MF
 

Modified: tools/springframework/trunk/project.xml
===================================================================
--- tools/springframework/trunk/project.xml	2008-08-27 06:55:41 UTC (rev 2883)
+++ tools/springframework/trunk/project.xml	2008-08-27 07:01:14 UTC (rev 2884)
@@ -6,8 +6,8 @@
     <name>DataNucleus SpringFramework plugin</name>
     <shortDescription>SpringFramework plugin for DataNucleus</shortDescription>
     <description><![CDATA[
-        DataNucleus can be used with SpringFramework out of the box. This plugin
-        provides for enhanced connectivity.
+        DataNucleus can be used with SpringFramework out of the box.
+        This plugin provides for enhanced connectivity.
         ]]></description>
 
     <!-- Software Dependencies -->
@@ -15,7 +15,7 @@
         <dependency>
             <groupId>javax.jdo</groupId>
             <artifactId>jdo2-api</artifactId>
-            <version>2.1</version>
+            <version>2.2-SNAPSHOT</version>
             <url>http://java.sun.com/</url>
         </dependency>
         <dependency>
@@ -43,16 +43,18 @@
                 </includes>
             </resource>
             <resource>
-                <directory>${basedir}/../../..</directory>
+                <directory>${basedir}</directory>
+                <targetPath>META-INF/</targetPath>
                 <includes>
-                    <include>README</include>
-                    <include>LICENSE.txt</include>
+                    <include>NOTICE.txt</include>
+                    <include>README.txt</include>
                 </includes>
             </resource>
             <resource>
-                <directory>${basedir}/</directory>
+                <directory>${basedir}</directory>
                 <includes>
                     <include>plugin.xml</include>
+                    <include>META-INF/MANIFEST.MF</include>
                 </includes>
             </resource>
         </resources>


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

Revision: 3007
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=3007&view=rev
Author:   andy_jefferson
Date:     2008-08-29 10:57:37 +0000 (Fri, 29 Aug 2008)

Log Message:
-----------
continue on 1.0

Modified Paths:
--------------
    tools/springframework/trunk/pom.xml
    tools/springframework/trunk/project.xml

Modified: tools/springframework/trunk/pom.xml
===================================================================
--- tools/springframework/trunk/pom.xml	2008-08-29 10:57:08 UTC (rev 3006)
+++ tools/springframework/trunk/pom.xml	2008-08-29 10:57:37 UTC (rev 3007)
@@ -2,7 +2,7 @@
 <project>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.datanucleus</groupId>
-    <version>1.1-SNAPSHOT</version>
+    <version>1.0-SNAPSHOT</version>
     <artifactId>datanucleus-springframework</artifactId>
     <name>DataNucleus SpringFramework</name>
     <description>
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>org.datanucleus</groupId>
             <artifactId>datanucleus-core</artifactId>
-            <version>[1.1-SNAPSHOT, 2.0)</version>
+            <version>[1.0-SNAPSHOT, 2.0)</version>
         </dependency>
         <dependency>
             <groupId>javax.jdo</groupId>

Modified: tools/springframework/trunk/project.xml
===================================================================
--- tools/springframework/trunk/project.xml	2008-08-29 10:57:08 UTC (rev 3006)
+++ tools/springframework/trunk/project.xml	2008-08-29 10:57:37 UTC (rev 3007)
@@ -2,7 +2,7 @@
 <project>
     <groupId>org.datanucleus</groupId>
     <artifactId>datanucleus-springframework</artifactId>
-    <currentVersion>1.1-SNAPSHOT</currentVersion>
+    <currentVersion>1.0-SNAPSHOT</currentVersion>
     <name>DataNucleus SpringFramework plugin</name>
     <shortDescription>SpringFramework plugin for DataNucleus</shortDescription>
     <description><![CDATA[
@@ -21,7 +21,7 @@
         <dependency>
             <groupId>org.datanucleus</groupId>
             <artifactId>datanucleus-core</artifactId>
-            <version>1.1-SNAPSHOT</version>
+            <version>1.0-SNAPSHOT</version>
             <url>http://www.org.datanucleus.org/</url>
         </dependency>
         <dependency>


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

Revision: 3276
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=3276&view=rev
Author:   andy_jefferson
Date:     2008-09-23 09:55:22 +0000 (Tue, 23 Sep 2008)

Log Message:
-----------
Remvoe txn isolation since now part of JDO2.2

Modified Paths:
--------------
    tools/springframework/trunk/META-INF/MANIFEST.MF
    tools/springframework/trunk/src/java/org/datanucleus/springframework/DataNucleusJdoDialect.java

Modified: tools/springframework/trunk/META-INF/MANIFEST.MF
===================================================================
--- tools/springframework/trunk/META-INF/MANIFEST.MF	2008-09-23 09:33:49 UTC (rev 3275)
+++ tools/springframework/trunk/META-INF/MANIFEST.MF	2008-09-23 09:55:22 UTC (rev 3276)
@@ -2,6 +2,6 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: DataNucleus SpringFramework
 Bundle-SymbolicName: org.datanucleus.springframework;singleton:=true
-Bundle-Version: 1.0.0.final
+Bundle-Version: 1.0.1
 Bundle-Vendor: DataNucleus
 Require-Bundle: org.datanucleus

Modified: tools/springframework/trunk/src/java/org/datanucleus/springframework/DataNucleusJdoDialect.java
===================================================================
--- tools/springframework/trunk/src/java/org/datanucleus/springframework/DataNucleusJdoDialect.java	2008-09-23 09:33:49 UTC (rev 3275)
+++ tools/springframework/trunk/src/java/org/datanucleus/springframework/DataNucleusJdoDialect.java	2008-09-23 09:55:22 UTC (rev 3276)
@@ -20,35 +20,15 @@
 package org.datanucleus.springframework;
 
 import javax.jdo.JDOException;
-import javax.jdo.Transaction;
 
 import org.springframework.orm.jdo.DefaultJdoDialect;
-import org.springframework.transaction.TransactionDefinition;
 
 /**
- * Dialect for using DataNucleus within Spring's JDO support, giving finer control over transactions and queries.
+ * Dialect for using DataNucleus within Spring's JDO support, giving finer control over queries.
  */
 public class DataNucleusJdoDialect extends DefaultJdoDialect
 {
     /**
-     * Method to start a transaction. Hooks into DataNucleus's configurability for transactions.
-     * @param transaction The transaction to start
-     * @param definition Definition of the transaction
-     * @return The transaction
-     */
-    public Object beginTransaction(Transaction transaction, TransactionDefinition definition)
-    throws JDOException
-    {
-        if (definition.getIsolationLevel() != TransactionDefinition.ISOLATION_DEFAULT)
-        {
-            ((org.datanucleus.Transaction)transaction).setOption("transaction.isolation", 
-                definition.getIsolationLevel());
-        }
-        transaction.begin();
-        return null;
-    }
-
-    /**
      * Method to apply a timeout to the specified query.
      * @param query The query
      * @param remainingTimeInSeconds The timeout to apply


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