Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 38083 invoked from network); 2 Jul 2007 04:32:29 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 Jul 2007 04:32:29 -0000 Received: (qmail 14457 invoked by uid 500); 2 Jul 2007 04:32:31 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 14301 invoked by uid 500); 2 Jul 2007 04:32:30 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 14285 invoked by uid 99); 2 Jul 2007 04:32:30 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 Jul 2007 21:32:30 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 Jul 2007 21:32:25 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 0AC5B1A981A; Sun, 1 Jul 2007 21:32:05 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r552399 - in /geronimo/server/trunk: assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/ configs/persistence-jpa10-deployer/src/plan/ maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/se... Date: Mon, 02 Jul 2007 04:32:04 -0000 To: scm@geronimo.apache.org From: kevan@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070702043205.0AC5B1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kevan Date: Sun Jul 1 21:31:56 2007 New Revision: 552399 URL: http://svn.apache.org/viewvc?view=rev&rev=552399 Log: GERONIMO-3270 better technique for setting operation-order 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/configs/persistence-jpa10-deployer/src/plan/plan.xml 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=552399&r1=552398&r2=552399 ============================================================================== --- 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 Sun Jul 1 21:31:56 2007 @@ -311,10 +311,9 @@ :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%" -Dopenjpa.jdbc.UpdateManager=operation-order +if exist "%JAVA_AGENT_JAR%" set JAVA_AGENT_OPTS=-javaagent:"%JAVA_AGENT_JAR%" @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=552399&r1=552398&r2=552399 ============================================================================== --- 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 Sun Jul 1 21:31:56 2007 @@ -284,10 +284,9 @@ 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 -Dopenjpa.jdbc.UpdateManager=operation-order" + JAVA_AGENT_OPTS="-javaagent:$JAVA_AGENT_JAR" else JAVA_AGENT_OPTS="" fi Modified: geronimo/server/trunk/configs/persistence-jpa10-deployer/src/plan/plan.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/persistence-jpa10-deployer/src/plan/plan.xml?view=diff&rev=552399&r1=552398&r2=552399 ============================================================================== --- geronimo/server/trunk/configs/persistence-jpa10-deployer/src/plan/plan.xml (original) +++ geronimo/server/trunk/configs/persistence-jpa10-deployer/src/plan/plan.xml Sun Jul 1 21:31:56 2007 @@ -25,9 +25,9 @@ ?name=ExtendedEntityManagerRegistry#org.apache.geronimo.persistence.ExtendedEntityManagerRegistry openjpa.Log=commons - openjpa.ClassTransformerOptions=ScanDevPath=true openjpa.jdbc.DBDictionary=org.apache.openjpa.jdbc.sql.DerbyDictionary openjpa.jdbc.SynchronizeMappings=buildSchema(ForeignKeys=true,SchemaAction='add,deleteTableContents') + openjpa.jdbc.UpdateManager=operation-order openjpa.Sequence=table(Table=OPENJPASEQ, Increment=100) 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=552399&r1=552398&r2=552399 ============================================================================== --- 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 Sun Jul 1 21:31:56 2007 @@ -187,11 +187,9 @@ } // 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