#At file:///Users/clr/ndb/bzr-repo/mysql-5.1-telco-7.1-coord/ based on revid:craig.russell@stripped
4038 Craig L Russell 2011-03-11 [merge]
Merge from main tree
modified:
storage/ndb/clusterj/clusterj-api/pom.xml
storage/ndb/clusterj/clusterj-bindings/pom.xml
storage/ndb/clusterj/clusterj-core/pom.xml
storage/ndb/clusterj/clusterj-jdbc/pom.xml
storage/ndb/clusterj/clusterj-jpatest/pom.xml
storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/PersistenceTestCase.java
storage/ndb/clusterj/clusterj-openjpa/pom.xml
storage/ndb/clusterj/clusterj-test/pom.xml
storage/ndb/clusterj/clusterj-tie/pom.xml
storage/ndb/clusterj/pom.xml
=== modified file 'storage/ndb/clusterj/clusterj-api/pom.xml'
--- a/storage/ndb/clusterj/clusterj-api/pom.xml 2011-03-11 02:37:21 +0000
+++ b/storage/ndb/clusterj/clusterj-api/pom.xml 2011-03-11 23:53:13 +0000
@@ -20,13 +20,13 @@
<parent>
<groupId>com.mysql.clusterj</groupId>
<artifactId>clusterj-aggregate</artifactId>
- <version>${versionNumber}</version>
+ <version>7.1.12-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.mysql.clusterj</groupId>
<artifactId>clusterj-api</artifactId>
<packaging>bundle</packaging>
- <version>${versionNumber}</version>
+ <version>7.1.12-SNAPSHOT</version>
<name>ClusterJ API</name>
<description>The API for ClusterJ</description>
<build>
=== modified file 'storage/ndb/clusterj/clusterj-bindings/pom.xml'
--- a/storage/ndb/clusterj/clusterj-bindings/pom.xml 2011-03-11 02:37:21 +0000
+++ b/storage/ndb/clusterj/clusterj-bindings/pom.xml 2011-03-11 23:53:13 +0000
@@ -20,13 +20,13 @@
<parent>
<groupId>com.mysql.clusterj</groupId>
<artifactId>clusterj-aggregate</artifactId>
- <version>${versionNumber}</version>
+ <version>7.1.12-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.mysql.clusterj</groupId>
<artifactId>clusterj-bindings</artifactId>
<packaging>bundle</packaging>
- <version>${versionNumber}</version>
+ <version>7.1.12-SNAPSHOT</version>
<name>ClusterJ Bindings</name>
<description>The ndb-bindings implementation of ClusterJ storage spi</description>
<build>
=== modified file 'storage/ndb/clusterj/clusterj-core/pom.xml'
--- a/storage/ndb/clusterj/clusterj-core/pom.xml 2011-03-11 02:37:21 +0000
+++ b/storage/ndb/clusterj/clusterj-core/pom.xml 2011-03-11 23:53:13 +0000
@@ -20,13 +20,13 @@
<parent>
<groupId>com.mysql.clusterj</groupId>
<artifactId>clusterj-aggregate</artifactId>
- <version>${versionNumber}</version>
+ <version>7.1.12-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.mysql.clusterj</groupId>
<artifactId>clusterj-core</artifactId>
<packaging>bundle</packaging>
- <version>${versionNumber}</version>
+ <version>7.1.12-SNAPSHOT</version>
<name>ClusterJ Core</name>
<description>The core implementation of ClusterJ</description>
<build>
=== modified file 'storage/ndb/clusterj/clusterj-jdbc/pom.xml'
--- a/storage/ndb/clusterj/clusterj-jdbc/pom.xml 2011-03-04 00:17:36 +0000
+++ b/storage/ndb/clusterj/clusterj-jdbc/pom.xml 2011-03-10 22:57:13 +0000
@@ -19,13 +19,13 @@
<parent>
<groupId>com.mysql.clusterj</groupId>
<artifactId>clusterj-aggregate</artifactId>
- <version>${versionNumber}</version>
+ <version>7.1.12-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>clusterj</groupId>
<artifactId>clusterj-jdbc</artifactId>
<name>ClusterJ JDBC Plugin</name>
- <version>${versionNumber}</version>
+ <version>7.1.12-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>junit</groupId>
=== modified file 'storage/ndb/clusterj/clusterj-jpatest/pom.xml'
--- a/storage/ndb/clusterj/clusterj-jpatest/pom.xml 2011-03-11 02:37:21 +0000
+++ b/storage/ndb/clusterj/clusterj-jpatest/pom.xml 2011-03-11 23:53:13 +0000
@@ -28,12 +28,12 @@
<parent>
<groupId>com.mysql.clusterj</groupId>
<artifactId>clusterj-aggregate</artifactId>
- <version>${versionNumber}</version>
+ <version>7.1.12-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.mysql.clusterj</groupId>
<artifactId>clusterj-jpatest</artifactId>
- <version>${versionNumber}</version>
+ <version>7.1.12-SNAPSHOT</version>
<packaging>jar</packaging>
<name>ClusterJ JPA Integration Tests</name>
=== modified file 'storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/PersistenceTestCase.java'
--- a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/PersistenceTestCase.java 2011-02-02 09:52:33 +0000
+++ b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/PersistenceTestCase.java 2011-03-11 01:50:56 +0000
@@ -18,6 +18,7 @@
package com.mysql.clusterj.jpatest;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
@@ -54,7 +55,14 @@ public abstract class PersistenceTestCas
* @param props configuration values in the form key, value, key, value...
*/
protected EntityManagerFactory createEMF(Object... props) {
- return createNamedEMF(getPersistenceUnitName(), props);
+ String puName = getPersistenceUnitName();
+ EntityManagerFactory result = createNamedEMF(puName, props);
+// if (result == null) {
+// System.out.println("Unable to create EMF with properties PUName " + puName + " props " + Arrays.toString(props));
+// } else {
+// System.out.println("Created EMF with properties PUName " + puName + " props " + Arrays.toString(props));
+// }
+ return result;
}
/**
@@ -64,7 +72,7 @@ public abstract class PersistenceTestCas
protected String getPersistenceUnitName() {
String puName = System.getProperty(
"com.mysql.clusterj.jpa.PersistenceUnit", "ndb");
- if (puName.equals("${com.mysql.clusterj.jpa.PersistenceUnit}")) {
+ if (puName.length() == 0 || puName.equals("${com.mysql.clusterj.jpa.PersistenceUnit}")) {
return "ndb";
} else {
return puName;
=== modified file 'storage/ndb/clusterj/clusterj-openjpa/pom.xml'
--- a/storage/ndb/clusterj/clusterj-openjpa/pom.xml 2011-03-11 02:37:21 +0000
+++ b/storage/ndb/clusterj/clusterj-openjpa/pom.xml 2011-03-11 23:53:13 +0000
@@ -24,12 +24,12 @@
<parent>
<groupId>com.mysql.clusterj</groupId>
<artifactId>clusterj-aggregate</artifactId>
- <version>${versionNumber}</version>
+ <version>7.1.12-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.mysql.clusterj</groupId>
<artifactId>clusterj-openjpa</artifactId>
- <version>${versionNumber}</version>
+ <version>7.1.12-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ClusterJ OpenJPA Integration</name>
=== modified file 'storage/ndb/clusterj/clusterj-test/pom.xml'
--- a/storage/ndb/clusterj/clusterj-test/pom.xml 2011-03-11 02:37:21 +0000
+++ b/storage/ndb/clusterj/clusterj-test/pom.xml 2011-03-11 23:53:13 +0000
@@ -20,13 +20,13 @@
<parent>
<groupId>com.mysql.clusterj</groupId>
<artifactId>clusterj-aggregate</artifactId>
- <version>${versionNumber}</version>
+ <version>7.1.12-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.mysql.clusterj</groupId>
<artifactId>clusterj-test</artifactId>
<packaging>jar</packaging>
- <version>${versionNumber}</version>
+ <version>7.1.12-SNAPSHOT</version>
<name>ClusterJ Test Suite</name>
<build>
<plugins>
=== modified file 'storage/ndb/clusterj/clusterj-tie/pom.xml'
--- a/storage/ndb/clusterj/clusterj-tie/pom.xml 2011-03-11 02:37:21 +0000
+++ b/storage/ndb/clusterj/clusterj-tie/pom.xml 2011-03-11 23:53:13 +0000
@@ -20,13 +20,13 @@
<parent>
<groupId>com.mysql.clusterj</groupId>
<artifactId>clusterj-aggregate</artifactId>
- <version>${versionNumber}</version>
+ <version>7.1.12-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.mysql.clusterj</groupId>
<artifactId>clusterj-tie</artifactId>
<packaging>bundle</packaging>
- <version>${versionNumber}</version>
+ <version>7.1.12-SNAPSHOT</version>
<name>ClusterJ Tie</name>
<description>The ndbj-tie implementation of ClusterJ storage spi</description>
<build>
=== modified file 'storage/ndb/clusterj/pom.xml'
--- a/storage/ndb/clusterj/pom.xml 2011-03-11 02:37:21 +0000
+++ b/storage/ndb/clusterj/pom.xml 2011-03-11 23:53:13 +0000
@@ -18,25 +18,43 @@
<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">
<properties>
- <versionNumber>7.1.12-coord-SNAPSHOT</versionNumber>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<modelVersion>4.0.0</modelVersion>
<groupId>com.mysql.clusterj</groupId>
<artifactId>clusterj-aggregate</artifactId>
<packaging>pom</packaging>
- <version>${versionNumber}</version>
+ <version>7.1.12-SNAPSHOT</version>
<name>ClusterJ Aggregate</name>
<description>The aggregate maven project of ClusterJ</description>
<modules>
<module>clusterj-api</module>
<module>clusterj-core</module>
- <module>clusterj-jdbc</module>
<module>clusterj-test</module>
<module>clusterj-tie</module>
<module>clusterj-jdbc</module>
<module>clusterj-jpatest</module>
<module>clusterj-openjpa</module>
</modules>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.0</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.7.2</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
<dependencyManagement>
<dependencies>
<dependency>
@@ -64,32 +82,32 @@
<dependency>
<groupId>com.mysql.clusterj</groupId>
<artifactId>clusterj-api</artifactId>
- <version>${versionNumber}</version>
+ <version>7.1.12-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.mysql.clusterj</groupId>
<artifactId>clusterj-core</artifactId>
- <version>${versionNumber}</version>
+ <version>7.1.12-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.mysql.clusterj</groupId>
<artifactId>clusterj-test</artifactId>
- <version>${versionNumber}</version>
+ <version>7.1.12-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.mysql.clusterj</groupId>
<artifactId>clusterj-tie</artifactId>
- <version>${versionNumber}</version>
+ <version>7.1.12-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.mysql.clusterj</groupId>
<artifactId>clusterj-jpatest</artifactId>
- <version>${versionNumber}</version>
+ <version>7.1.12-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>ndbjtie</groupId>
<artifactId>ndbjtie</artifactId>
- <version>${versionNumber}</version>
+ <version>7.1.12-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>
Attachment: [text/bzr-bundle] bzr/craig.russell@oracle.com-20110311235313-eos706wrtwknedqe.bundle
| Thread |
|---|
| • bzr commit into mysql-5.1-telco-7.1-coord branch (Craig.Russell:4038) | Craig L Russell | 12 Mar |
