geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke...@apache.org
Subject svn commit: r551608 - in /geronimo/server/trunk: assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/ maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/
Date Thu, 28 Jun 2007 16:12:36 GMT
Author: kevan
Date: Thu Jun 28 09:12:32 2007
New Revision: 551608

URL: http://svn.apache.org/viewvc?view=rev&rev=551608
Log:
GERONIMO-3270 Avoid foreign key violations in CMP. Using operation-order avoids the problem

Modified:
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/geronimo.bat
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/geronimo.sh
    geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/StartServerMojo.java

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/geronimo.bat
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/geronimo.bat?view=diff&rev=551608&r1=551607&r2=551608
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/geronimo.bat
(original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/geronimo.bat
Thu Jun 28 09:12:32 2007
@@ -311,9 +311,10 @@
 :doneSetArgs
 
 @REM Setup the Java programming language agent
+@REM For proper CMP behavior, we currently must specify operation-order
 set JAVA_AGENT_JAR=%GERONIMO_BASE%\bin\jpa.jar
 set JAVA_AGENT_OPTS=
-if exist "%JAVA_AGENT_JAR%" set JAVA_AGENT_OPTS=-javaagent:"%JAVA_AGENT_JAR%"
+if exist "%JAVA_AGENT_JAR%" set JAVA_AGENT_OPTS=-javaagent:"%JAVA_AGENT_JAR%" -Dopenjpa.jdbc.UpdateManager=operation-order
 
 @REM Execute Java with the applicable properties
 if not "%JDB%" == "" goto doJDB

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/geronimo.sh
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/geronimo.sh?view=diff&rev=551608&r1=551607&r2=551608
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/geronimo.sh
(original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/geronimo.sh
Thu Jun 28 09:12:32 2007
@@ -284,9 +284,10 @@
 fi
 
 # Setup the Java programming language agent
+# For proper CMP behavior, we currently must specify operation-order
 JAVA_AGENT_JAR="$GERONIMO_BASE/bin/jpa.jar"
 if [ -f "$JAVA_AGENT_JAR" ]; then
-    JAVA_AGENT_OPTS="-javaagent:$JAVA_AGENT_JAR"
+    JAVA_AGENT_OPTS="-javaagent:$JAVA_AGENT_JAR -Dopenjpa.jdbc.UpdateManager=operation-order"
 else
     JAVA_AGENT_OPTS=""
 fi

Modified: geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/StartServerMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/StartServerMojo.java?view=diff&rev=551608&r1=551607&r2=551608
==============================================================================
--- geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/StartServerMojo.java
(original)
+++ geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/StartServerMojo.java
Thu Jun 28 09:12:32 2007
@@ -187,9 +187,11 @@
         }
 
         // Load the Java programming language agent for JPA
+        // set operation-order is required for compliant behavior from OpenJPA
         File javaAgentJar = new File(geronimoHome, "bin/jpa.jar");
         if (javaAgentJar.exists()) {
             java.createJvmarg().setValue("-javaagent:" + javaAgentJar.getCanonicalPath());
+            setSystemProperty(java, "openjpa.jdbc.UpdateManager", "operation-order");
         }
 
         // Propagate some properties from Maven to the server if enabled



Mime
View raw message