From commits-return-5201-apmail-continuum-commits-archive=continuum.apache.org@continuum.apache.org Fri Apr 17 18:08:59 2009
Return-Path: <commits-return-5201-apmail-continuum-commits-archive=continuum.apache.org@continuum.apache.org>
Delivered-To: apmail-continuum-commits-archive@www.apache.org
Received: (qmail 78114 invoked from network); 17 Apr 2009 18:08:59 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 17 Apr 2009 18:08:59 -0000
Received: (qmail 56205 invoked by uid 500); 17 Apr 2009 18:08:59 -0000
Delivered-To: apmail-continuum-commits-archive@continuum.apache.org
Received: (qmail 56179 invoked by uid 500); 17 Apr 2009 18:08:59 -0000
Mailing-List: contact commits-help@continuum.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@continuum.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@continuum.apache.org>
List-Post: <mailto:commits@continuum.apache.org>
List-Id: <commits.continuum.apache.org>
Reply-To: dev@continuum.apache.org
Delivered-To: mailing list commits@continuum.apache.org
Received: (qmail 56170 invoked by uid 99); 17 Apr 2009 18:08:59 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 Apr 2009 18:08:59 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 Apr 2009 18:08:58 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 872F7238895F; Fri, 17 Apr 2009 18:08:38 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r766106 - in /continuum/branches/continuum-1.3.x:
 continuum-model/pom.xml
 continuum-model/src/main/resources/package-default.orm
 continuum-webapp/src/main/resources/META-INF/plexus/application.xml
Date: Fri, 17 Apr 2009 18:08:37 -0000
To: commits@continuum.apache.org
From: brett@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090417180838.872F7238895F@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: brett
Date: Fri Apr 17 18:08:37 2009
New Revision: 766106

URL: http://svn.apache.org/viewvc?rev=766106&view=rev
Log:
[CONTINUUM-2147] automatic upgrades made to work with at least Derby and MySQL

Added:
    continuum/branches/continuum-1.3.x/continuum-model/src/main/resources/package-default.orm   (with props)
Modified:
    continuum/branches/continuum-1.3.x/continuum-model/pom.xml
    continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/META-INF/plexus/application.xml

Modified: continuum/branches/continuum-1.3.x/continuum-model/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-model/pom.xml?rev=766106&r1=766105&r2=766106&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-model/pom.xml (original)
+++ continuum/branches/continuum-1.3.x/continuum-model/pom.xml Fri Apr 17 18:08:37 2009
@@ -47,9 +47,6 @@
             <goals>
               <goal>jpox-jdo-mapping</goal>
             </goals>
-            <configuration>
-              <outputDirectory>${basedir}/target/classes/META-INF</outputDirectory>
-            </configuration>
           </execution>
           <execution>
             <id>jpox-jdo-mapping-replication</id>
@@ -57,7 +54,6 @@
               <goal>jpox-jdo-mapping</goal>
             </goals>
             <configuration>
-              <outputDirectory>${basedir}/target/classes/META-INF</outputDirectory>
               <replicationParameters>true</replicationParameters>
             </configuration>
           </execution>

Added: continuum/branches/continuum-1.3.x/continuum-model/src/main/resources/package-default.orm
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-model/src/main/resources/package-default.orm?rev=766106&view=auto
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-model/src/main/resources/package-default.orm (added)
+++ continuum/branches/continuum-1.3.x/continuum-model/src/main/resources/package-default.orm Fri Apr 17 18:08:37 2009
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE orm PUBLIC
+    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.0//EN"
+    "http://java.sun.com/dtd/jdo_orm_2_0.dtd">
+<orm>
+  <package name="org.apache.maven.continuum.model.project">
+    <class name="ProjectNotifier">
+      <field name="sendOnScmFailure" null-value="default">
+        <column jdbc-type="CHAR" default-value="N" />
+      </field>
+    </class>
+  </package>
+  <package name="org.apache.maven.continuum.model.system">
+    <class name="SystemConfiguration">
+      <field name="distributedBuildEnabled" null-value="default">
+        <column jdbc-type="CHAR" default-value="N" />
+      </field>
+    </class>
+  </package>
+</orm>

Propchange: continuum/branches/continuum-1.3.x/continuum-model/src/main/resources/package-default.orm
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/META-INF/plexus/application.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/META-INF/plexus/application.xml?rev=766106&r1=766105&r2=766106&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/META-INF/plexus/application.xml (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/META-INF/plexus/application.xml Fri Apr 17 18:08:37 2009
@@ -227,11 +227,12 @@
         <persistenceManagerFactoryClass>org.jpox.PersistenceManagerFactoryImpl</persistenceManagerFactoryClass>
 
         <otherProperties>
-          <!-- uncomment this property for mssql support - CONTINUUM-697 -->
-          <!-- property>
+          <property>
             <name>javax.jdo.option.Mapping</name>
-            <value>mssql</value>
-          </property -->
+            <value>default</value>
+            <!-- change this property for mssql support - CONTINUUM-697 -->
+            <!-- value>mssql</value -->
+          </property>
           <property>
             <name>org.jpox.autoCreateSchema</name>
             <value>true</value>