update to latest releases and JDK

yuanzac · Jun 3, 2014 · a5e312c · a5e312c
1 parent 79eef59
commit a5e312c
Show file tree

Hide file tree

Showing 11 changed files with 45 additions and 62 deletions.
diff --git a/many_to_many/.classpath b/many_to_many/.classpath
@@ -17,12 +17,12 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>

diff --git a/many_to_many/.settings/org.eclipse.jdt.core.prefs b/many_to_many/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,5 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/many_to_many/pom.xml b/many_to_many/pom.xml
@@ -9,41 +9,21 @@
     <name>DataNucleus AccessPlatform JDO Many-to-Many Relation Sample</name>
     <url>http://www.datanucleus.org</url>
 
-    <repositories>
-        <repository>
-            <id>DN_M2_Repo</id>
-            <name>DataNucleus Repository</name>
-            <url>http://www.datanucleus.org/downloads/maven2</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>DataNucleus_2</id>
-            <url>http://www.datanucleus.org/downloads/maven2/</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>
-
     <dependencies>
         <dependency>
             <groupId>org.datanucleus</groupId>
             <artifactId>datanucleus-core</artifactId>
-            <version>[4.0.0-m1-SNAPSHOT, )</version>
+            <version>[4.0.0-m4, )</version>
         </dependency>
         <dependency>
             <groupId>org.datanucleus</groupId>
             <artifactId>datanucleus-api-jdo</artifactId>
-            <version>[4.0.0-m1-SNAPSHOT, )</version>
+            <version>[4.0.0-m4, )</version>
         </dependency>
         <dependency>
             <groupId>org.datanucleus</groupId>
             <artifactId>datanucleus-rdbms</artifactId>
-            <version>[4.0.0-m1-SNAPSHOT, )</version>
+            <version>[4.0.0-m4, )</version>
         </dependency>
         <dependency>
             <groupId>javax.jdo</groupId>
@@ -94,14 +74,14 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>2.3.2</version>
                 <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
+                    <source>1.7</source>
+                    <target>1.7</target>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.datanucleus</groupId>
                 <artifactId>datanucleus-maven-plugin</artifactId>
-                <version>4.0.0-m1-SNAPSHOT</version>
+                <version>4.0.0-m3</version>
                 <configuration>
                     <persistenceUnitName>MyTest</persistenceUnitName>
                     <log4jConfiguration>${basedir}/src/main/resources/log4j.properties</log4jConfiguration>

diff --git a/many_to_many/src/main/java/org/datanucleus/samples/jdo/many_many/Customer.java b/many_to_many/src/main/java/org/datanucleus/samples/jdo/many_many/Customer.java
@@ -20,10 +20,14 @@
 import java.util.Collection;
 import java.util.HashSet;
 
+//@PersistenceCapable
 public class Customer
 {
     String name = null;
+
     String description = null;
+
+    //@Persistent(mappedBy="customers")
     Collection suppliers = new HashSet();
 
     public Customer(String name, String desc)

diff --git a/many_to_many/src/main/java/org/datanucleus/samples/jdo/many_many/Supplier.java b/many_to_many/src/main/java/org/datanucleus/samples/jdo/many_many/Supplier.java
@@ -20,10 +20,13 @@
 import java.util.Collection;
 import java.util.HashSet;
 
+//@PersistenceCapable
 public class Supplier
 {
     String name = null;
+
     String address = null;
+
     Collection customers = new HashSet();
 
     public Supplier(String name,String address)

diff --git a/many_to_many_attributed/.classpath b/many_to_many_attributed/.classpath
@@ -17,12 +17,12 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>

diff --git a/many_to_many_attributed/.settings/org.eclipse.jdt.core.prefs b/many_to_many_attributed/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,5 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/many_to_many_attributed/pom.xml b/many_to_many_attributed/pom.xml
@@ -9,41 +9,21 @@
     <name>DataNucleus AccessPlatform JDO Many-to-Many Attributed Relation Sample</name>
     <url>http://www.datanucleus.org</url>
 
-    <repositories>
-        <repository>
-            <id>DN_M2_Repo</id>
-            <name>DataNucleus Repository</name>
-            <url>http://www.datanucleus.org/downloads/maven2</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>DataNucleus_2</id>
-            <url>http://www.datanucleus.org/downloads/maven2/</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>
-
     <dependencies>
         <dependency>
             <groupId>org.datanucleus</groupId>
             <artifactId>datanucleus-core</artifactId>
-            <version>[4.0.0-m1-SNAPSHOT, )</version>
+            <version>[4.0.0-m4, )</version>
         </dependency>
         <dependency>
             <groupId>org.datanucleus</groupId>
             <artifactId>datanucleus-api-jdo</artifactId>
-            <version>[4.0.0-m1-SNAPSHOT, )</version>
+            <version>[4.0.0-m4, )</version>
         </dependency>
         <dependency>
             <groupId>org.datanucleus</groupId>
             <artifactId>datanucleus-rdbms</artifactId>
-            <version>[4.0.0-m1-SNAPSHOT, )</version>
+            <version>[4.0.0-m4, )</version>
         </dependency>
         <dependency>
             <groupId>javax.jdo</groupId>
@@ -94,14 +74,14 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>2.3.2</version>
                 <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
+                    <source>1.7</source>
+                    <target>1.7</target>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.datanucleus</groupId>
                 <artifactId>datanucleus-maven-plugin</artifactId>
-                <version>4.0.0-m1-SNAPSHOT</version>
+                <version>4.0.0-m3</version>
                 <configuration>
                     <persistenceUnitName>MyTest</persistenceUnitName>
                     <log4jConfiguration>${basedir}/src/main/resources/log4j.properties</log4jConfiguration>

diff --git a/...uted/src/main/java/org/datanucleus/samples/jdo/many_many_attributed/BusinessRelation.java b/...uted/src/main/java/org/datanucleus/samples/jdo/many_many_attributed/BusinessRelation.java
@@ -22,11 +22,17 @@
 
 import javax.jdo.identity.LongIdentity;
 
+//@PersistenceCapable
 public class BusinessRelation
 {
+    //@PrimaryKey
     private Customer customer;
+
+    //@PrimaryKey
     private Supplier supplier;
+
     private String relationLevel;
+
     private String meetingLocation;
 
     public BusinessRelation(Customer cust, Supplier supp, String level, String meeting)

diff --git a/...y_attributed/src/main/java/org/datanucleus/samples/jdo/many_many_attributed/Customer.java b/...y_attributed/src/main/java/org/datanucleus/samples/jdo/many_many_attributed/Customer.java
@@ -20,10 +20,15 @@
 import java.util.HashSet;
 import java.util.Set;
 
+//@PersistenceCapable
 public class Customer
 {
+    //@PrimaryKey
     long id;
+
     String name = null;
+
+    //@Persistent(mappedBy="customer")
     Set<BusinessRelation> supplierRelations = new HashSet();
 
     public Customer(String name)

diff --git a/...y_attributed/src/main/java/org/datanucleus/samples/jdo/many_many_attributed/Supplier.java b/...y_attributed/src/main/java/org/datanucleus/samples/jdo/many_many_attributed/Supplier.java
@@ -20,10 +20,15 @@
 import java.util.HashSet;
 import java.util.Set;
 
+//@PersistenceCapable
 public class Supplier
 {
+    //@PrimaryKey
     long id;
+
     String name = null;
+
+    //@Persistent(mappedBy="supplier")
     Set<BusinessRelation> customerRelations = new HashSet();
 
     public Supplier(String name)