You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by br...@apache.org on 2012/11/21 06:12:03 UTC
svn commit: r1411986 - in /continuum/trunk/continuum-model/src/main:
mdo/continuum.xml resources/META-INF/package.jdo
resources/META-INF/package.jdorepl resources/package-default.orm
Author: brett
Date: Wed Nov 21 05:12:03 2012
New Revision: 1411986
URL: http://svn.apache.org/viewvc?rev=1411986&view=rev
Log:
[CONTINUUM-2519] Database upgrade script fails
Since the JDO file is now checked in, several changes to the model file had not been propagated there. In addition, the change added to the ORM file needed to be merged into a single package element where they had the same name otherwise it was ignored.
Modified:
continuum/trunk/continuum-model/src/main/mdo/continuum.xml
continuum/trunk/continuum-model/src/main/resources/META-INF/package.jdo
continuum/trunk/continuum-model/src/main/resources/META-INF/package.jdorepl
continuum/trunk/continuum-model/src/main/resources/package-default.orm
Modified: continuum/trunk/continuum-model/src/main/mdo/continuum.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-model/src/main/mdo/continuum.xml?rev=1411986&r1=1411985&r2=1411986&view=diff
==============================================================================
--- continuum/trunk/continuum-model/src/main/mdo/continuum.xml (original)
+++ continuum/trunk/continuum-model/src/main/mdo/continuum.xml Wed Nov 21 05:12:03 2012
@@ -326,7 +326,7 @@
<version>1.1.0+</version>
<type>String</type>
</field>
- <field>
+ <field jpox.null-value="default">
<name>checkedOutInSingleDirectory</name>
<version>1.4.1+</version>
<type>boolean</type>
Modified: continuum/trunk/continuum-model/src/main/resources/META-INF/package.jdo
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-model/src/main/resources/META-INF/package.jdo?rev=1411986&r1=1411985&r2=1411986&view=diff
==============================================================================
--- continuum/trunk/continuum-model/src/main/resources/META-INF/package.jdo (original)
+++ continuum/trunk/continuum-model/src/main/resources/META-INF/package.jdo Wed Nov 21 05:12:03 2012
@@ -86,6 +86,7 @@
<column length="256"/>
</field>
<field name="relativePath"/>
+ <field name="checkedOutInSingleDirectory" null-value="default"/>
<field name="buildResults" mapped-by="project">
<collection element-type="BuildResult" dependent-element="true"/>
</field>
@@ -173,6 +174,7 @@
<field name="buildDefinition" default-fetch-group="true"/>
<field name="id" primary-key="true" value-strategy="native"/>
<field name="buildNumber"/>
+ <field name="username"/>
<field name="state">
<column name="resultstate"/>
</field>
@@ -222,6 +224,9 @@
<field name="template">
<column name="is_template"/>
</field>
+ <field name="updatePolicy" null-value="default">
+ <column default-value="0"/>
+ </field>
</class>
<class name="BuildDefinitionTemplate" detachable="true" table="BuildDefinitionTemplate" identity-type="application" objectid-class="javax.jdo.identity.IntIdentity">
<field name="id" primary-key="true" value-strategy="native"/>
@@ -264,7 +269,7 @@
</class>
<class name="ContinuumModelloMetadata" detachable="true">
<field name="modelVersion" null-value="default">
- <column default-value="1.3.3"/>
+ <column default-value="1.4.1"/>
</field>
</class>
</package>
@@ -330,6 +335,7 @@
<field name="projectGroup" default-fetch-group="true"/>
<field name="project" default-fetch-group="true"/>
<field name="releaseGoal"/>
+ <field name="username"/>
</class>
</package>
<package name="org.apache.continuum.model.repository">
Modified: continuum/trunk/continuum-model/src/main/resources/META-INF/package.jdorepl
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-model/src/main/resources/META-INF/package.jdorepl?rev=1411986&r1=1411985&r2=1411986&view=diff
==============================================================================
--- continuum/trunk/continuum-model/src/main/resources/META-INF/package.jdorepl (original)
+++ continuum/trunk/continuum-model/src/main/resources/META-INF/package.jdorepl Wed Nov 21 05:12:03 2012
@@ -86,6 +86,7 @@
<column length="256"/>
</field>
<field name="relativePath"/>
+ <field name="checkedOutInSingleDirectory" null-value="default"/>
<field name="buildResults" mapped-by="project">
<collection element-type="BuildResult" dependent-element="true"/>
</field>
@@ -173,6 +174,7 @@
<field name="buildDefinition" default-fetch-group="true"/>
<field name="id" primary-key="true"/>
<field name="buildNumber"/>
+ <field name="username"/>
<field name="state">
<column name="resultstate"/>
</field>
@@ -222,6 +224,9 @@
<field name="template">
<column name="is_template"/>
</field>
+ <field name="updatePolicy" null-value="default">
+ <column default-value="0"/>
+ </field>
</class>
<class name="BuildDefinitionTemplate" detachable="true" table="BuildDefinitionTemplate" identity-type="application">
<field name="id" primary-key="true"/>
@@ -264,7 +269,7 @@
</class>
<class name="ContinuumModelloMetadata" detachable="true">
<field name="modelVersion" null-value="default">
- <column default-value="1.3.3"/>
+ <column default-value="1.4.1"/>
</field>
</class>
</package>
@@ -330,6 +335,7 @@
<field name="projectGroup" default-fetch-group="true"/>
<field name="project" default-fetch-group="true"/>
<field name="releaseGoal"/>
+ <field name="username"/>
</class>
</package>
<package name="org.apache.continuum.model.repository">
Modified: continuum/trunk/continuum-model/src/main/resources/package-default.orm
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-model/src/main/resources/package-default.orm?rev=1411986&r1=1411985&r2=1411986&view=diff
==============================================================================
--- continuum/trunk/continuum-model/src/main/resources/package-default.orm (original)
+++ continuum/trunk/continuum-model/src/main/resources/package-default.orm Wed Nov 21 05:12:03 2012
@@ -9,17 +9,15 @@
<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">
+ <class name="Project">
+ <field name="checkedOutInSingleDirectory" null-value="default">
<column jdbc-type="CHAR" default-value="N" />
</field>
</class>
</package>
- <package name="org.apache.maven.continuum.model.project">
- <class name="Project">
- <field name="checkedOutInSingleDirectory" null-value="default">
+ <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>