You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by jv...@apache.org on 2005/07/20 03:22:20 UTC
svn commit: r219825 - in
/maven/continuum/trunk/continuum-model/src/main/resources:
META-INF/package.jdo continuum.mdo
Author: jvanzyl
Date: Tue Jul 19 18:22:19 2005
New Revision: 219825
URL: http://svn.apache.org/viewcvs?rev=219825&view=rev
Log:
o our experimental model changes
Modified:
maven/continuum/trunk/continuum-model/src/main/resources/META-INF/package.jdo
maven/continuum/trunk/continuum-model/src/main/resources/continuum.mdo
Modified: maven/continuum/trunk/continuum-model/src/main/resources/META-INF/package.jdo
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-model/src/main/resources/META-INF/package.jdo?rev=219825&r1=219824&r2=219825&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-model/src/main/resources/META-INF/package.jdo (original)
+++ maven/continuum/trunk/continuum-model/src/main/resources/META-INF/package.jdo Tue Jul 19 18:22:19 2005
@@ -17,7 +17,7 @@
<field name="latestBuildId" persistence-modifier="persistent"/>
<field name="previousBuildId" persistence-modifier="persistent"/>
<field name="buildNumber" persistence-modifier="persistent"/>
- <field name="scmResult" persistence-modifier="persistent" default-fetch-group="true" dependent="true"/>
+ <field name="scmResult" persistence-modifier="persistent" dependent="true"/>
<field name="checkOutErrorMessage" persistence-modifier="persistent"/>
<field name="checkOutErrorException" persistence-modifier="persistent"/>
<field name="mailType" persistence-modifier="persistent"/>
@@ -44,12 +44,23 @@
<collection element-type="ContinuumSchedule"/>
<join/>
</field>
+
+ <field name="buildGroups" persistence-modifier="persistent">
+ <collection element-type="ContinuumBuildGroup"/>
+ <join/>
+ </field>
+
+ <field name="projectGroup" persistence-modifier="persistent"/>
+
<fetch-group name="project-detail">
<field name="builds"/>
<field name="developers"/>
<field name="notifiers"/>
<field name="dependencies"/>
<field name="schedules"/>
+ <field name="buildGroups"/>
+ <field name="projectGroup"/>
+ <field name="scmResult"/>
</fetch-group>
</class>
@@ -65,8 +76,8 @@
<field name="delay" persistence-modifier="persistent"/>
<field name="cronExpression" persistence-modifier="persistent"/>
<fetch-group name="schedule-detail">
- <field name="projects"/>
- </fetch-group>
+ <field name="projects"/>
+ </fetch-group>
</class>
<class name="ContinuumNotifier" detachable="true" identity-type="datastore">
@@ -113,9 +124,55 @@
<field name="error" persistence-modifier="persistent">
<extension vendor-name="jpox" key="length" value="max 8000"/>
</field>
+ <field name="success" persistence-modifier="persistent"/>
<field name="exitCode" persistence-modifier="persistent"/>
<field name="scmResult" persistence-modifier="persistent" default-fetch-group="true" dependent="true"/>
</class>
+
+ <!-- New Object Model -->
+
+ <class name="ContinuumBuildGroup" detachable="true" identity-type="application">
+ <field name="id" persistence-modifier="persistent" primary-key="true" value-strategy="native"/>
+ <field name="name" persistence-modifier="persistent"/>
+ <field name="description" persistence-modifier="persistent"/>
+ <field name="projects" persistence-modifier="persistent" mapped-by="buildGroups">
+ <collection element-type="ContinuumProject"/>
+ </field>
+ <field name="buildSettings" persistence-modifier="persistent">
+ <collection element-type="ContinuumBuildSettings"/>
+ <join/>
+ </field>
+ </class>
+
+ <class name="ContinuumProjectGroup" detachable="true" identity-type="application">
+ <field name="id" persistence-modifier="persistent" primary-key="true" value-strategy="native"/>
+ <field name="groupId" persistence-modifier="persistent"/>
+ <field name="name" persistence-modifier="persistent"/>
+ <field name="description" persistence-modifier="persistent"/>
+ <field name="url" persistence-modifier="persistent"/>
+ <field name="issueManagementUrl" persistence-modifier="persistent"/>
+ <field name="projects" persistence-modifier="persistent" mapped-by="projectGroup"/>
+ <field name="buildSettings" persistence-modifier="persistent">
+ <collection element-type="ContinuumBuildSettings"/>
+ <join/>
+ </field>
+ </class>
+
+ <class name="ContinuumBuildSettings" detachable="true" identity-type="application">
+ <field name="id" persistence-modifier="persistent" primary-key="true" value-strategy="native"/>
+ <field name="name" persistence-modifier="persistent"/>
+ <field name="notificationScheme" persistence-modifier="persistent"/>
+ <field name="labelingScheme" persistence-modifier="persistent"/>
+ <field name="scmMode" persistence-modifier="persistent"/>
+ <field name="jdkVersion" persistence-modifier="persistent"/>
+ <field name="projectGroups" persistence-modifier="persistent" mapped-by="buildSettings">
+ <collection element-type="ContinuumProjectGroup"/>
+ </field>
+ <field name="buildGroups" persistence-modifier="persistent" mapped-by="buildSettings">
+ <collection element-type="ContinuumBuildGroup"/>
+ </field>
+ </class>
+
</package>
<package name="org.apache.maven.continuum.scm">
<class name="ScmResult" detachable="true" identity-type="datastore">
@@ -147,8 +204,7 @@
<!-- Profiles -->
<package name="org.apache.maven.continuum.profile">
- <class name="ContinuumProfile" detachable="true" identity-type="application">
- <field name="id" persistence-modifier="persistent" primary-key="true" value-strategy="native"/>
+ <class name="ContinuumProfile" detachable="true" identity-type="datastore">
<field name="jdk" persistence-modifier="persistent"/>
</class>
<class name="ContinuumJdk" detachable="true" identity-type="datastore">
Modified: maven/continuum/trunk/continuum-model/src/main/resources/continuum.mdo
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-model/src/main/resources/continuum.mdo?rev=219825&r1=219824&r2=219825&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-model/src/main/resources/continuum.mdo (original)
+++ maven/continuum/trunk/continuum-model/src/main/resources/continuum.mdo Tue Jul 19 18:22:19 2005
@@ -166,6 +166,23 @@
<multiplicity>*</multiplicity>
</association>
</field>
+ <field>
+ <name>buildGroups</name>
+ <version>1.0.0</version>
+ <type>Set</type>
+ <association stash.part="false">
+ <type>ContinuumBuildGroup</type>
+ <multiplicity>*</multiplicity>
+ </association>
+ </field>
+ <field>
+ <name>projectGroup</name>
+ <version>1.0.0</version>
+ <type>Set</type>
+ <association stash.part="false">
+ <type>ContinuumProjectGroup</type>
+ </association>
+ </field>
</fields>
</class>
@@ -417,6 +434,17 @@
<name>error</name>
<version>1.0.0</version>
<type>String</type>
+ <!--
+ <association>
+ <type>java.lang.Throwable</type>
+ </association>
+ -->
+ </field>
+
+ <field>
+ <name>success</name>
+ <version>1.0.0</version>
+ <type>boolean</type>
</field>
<field>
<name>exitCode</name>
@@ -553,11 +581,6 @@
<version>1.0.0</version>
<fields>
<field>
- <name>id</name>
- <version>1.0.0</version>
- <type>String</type>
- </field>
- <field>
<name>jdk</name>
<version>1.0.0</version>
<association>
@@ -584,6 +607,161 @@
</field>
</fields>
</class>
-
+
+ <!-- New Object Model -->
+
+ <class>
+ <name>ContinuumBuildGroup</name>
+ <version>1.0.0</version>
+ <fields>
+ <field>
+ <name>id</name>
+ <version>1.0.0</version>
+ <type>String</type>
+ <identifier>true</identifier>
+ </field>
+ <field>
+ <name>name</name>
+ <version>1.0.0</version>
+ <type>String</type>
+ </field>
+ <field>
+ <name>description</name>
+ <version>1.0.0</version>
+ <type>String</type>
+ </field>
+ <field>
+ <name>projects</name>
+ <version>1.0.0</version>
+ <type>Set</type>
+ <association stash.part="false">
+ <type>ContinuumProject</type>
+ <multiplicity>*</multiplicity>
+ </association>
+ </field>
+ <field>
+ <name>buildSettings</name>
+ <version>1.0.0</version>
+ <type>Set</type>
+ <association stash.part="false">
+ <type>ContinuumBuildSettings</type>
+ <multiplicity>*</multiplicity>
+ </association>
+ </field>
+ </fields>
+ </class>
+
+ <class>
+ <name>ContinuumProjectGroup</name>
+ <version>1.0.0</version>
+ <fields>
+ <field>
+ <name>id</name>
+ <version>1.0.0</version>
+ <type>String</type>
+ <identifier>true</identifier>
+ </field>
+ <field>
+ <name>groupId</name>
+ <version>1.0.0</version>
+ <type>String</type>
+ </field>
+ <field>
+ <name>name</name>
+ <version>1.0.0</version>
+ <type>String</type>
+ </field>
+ <field>
+ <name>description</name>
+ <version>1.0.0</version>
+ <type>String</type>
+ </field>
+ <field>
+ <name>url</name>
+ <version>1.0.0</version>
+ <type>String</type>
+ </field>
+ <field>
+ <name>issueManagementUrl</name>
+ <version>1.0.0</version>
+ <type>String</type>
+ </field>
+ <field>
+ <name>projects</name>
+ <version>1.0.0</version>
+ <type>Set</type>
+ <association stash.part="false">
+ <type>ContinuumProject</type>
+ <multiplicity>*</multiplicity>
+ </association>
+ </field>
+ <field>
+ <name>buildSettings</name>
+ <version>1.0.0</version>
+ <type>Set</type>
+ <association stash.part="false">
+ <type>ContinuumBuildSettings</type>
+ <multiplicity>*</multiplicity>
+ </association>
+ </field>
+ </fields>
+ </class>
+
+ <class>
+ <name>ContinuumBuildSettings</name>
+ <version>1.0.0</version>
+ <fields>
+ <field>
+ <name>id</name>
+ <version>1.0.0</version>
+ <type>String</type>
+ <identifier>true</identifier>
+ </field>
+ <field>
+ <name>name</name>
+ <version>1.0.0</version>
+ <type>String</type>
+ </field>
+ <field>
+ <name>notificationScheme</name>
+ <version>1.0.0</version>
+ <type>int</type>
+ </field>
+ <field>
+ <name>labelingScheme</name>
+ <version>1.0.0</version>
+ <type>int</type>
+ </field>
+ <field>
+ <name>scmMode</name>
+ <version>1.0.0</version>
+ <type>int</type>
+ </field>
+ <field>
+ <name>jdkVersion</name>
+ <version>1.0.0</version>
+ <type>String</type>
+ </field>
+ <field>
+ <name>buildGroups</name>
+ <version>1.0.0</version>
+ <type>Set</type>
+ <association stash.part="false">
+ <type>ContinuumBuildGroup</type>
+ <multiplicity>*</multiplicity>
+ </association>
+ </field>
+ <field>
+ <name>projectGroups</name>
+ <version>1.0.0</version>
+ <type>Set</type>
+ <association stash.part="false">
+ <type>ContinuumProjectGroup</type>
+ <multiplicity>*</multiplicity>
+ </association>
+ </field>
+ </fields>
+ </class>
+
</classes>
</model>