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/18 06:32:46 UTC

svn commit: r219454 - in /maven/continuum/trunk/continuum-model/src/main/resources: META-INF/package.jdo continuum.mdo

Author: jvanzyl
Date: Sun Jul 17 21:32:17 2005
New Revision: 219454

URL: http://svn.apache.org/viewcvs?rev=219454&view=rev
Log:
o adding schedules info
o removing collections from the default fetch group
o adding a "project-detail" fetch group which can be used to retrieve a full version of a ContinuumProject


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=219454&r1=219453&r2=219454&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 Sun Jul 17 21:32:17 2005
@@ -17,9 +17,6 @@
       <field name="latestBuildId" persistence-modifier="persistent"/>
       <field name="previousBuildId" persistence-modifier="persistent"/>
       <field name="buildNumber" persistence-modifier="persistent"/>
-      <field name="builds" persistence-modifier="persistent">
-        <collection element-type="ContinuumBuild" dependent-element="true"/>
-      </field>
       <field name="scmResult" persistence-modifier="persistent" default-fetch-group="true" dependent="true"/>
       <field name="checkOutErrorMessage" persistence-modifier="persistent"/>
       <field name="checkOutErrorException" persistence-modifier="persistent"/>
@@ -29,16 +26,46 @@
       <field name="artifactId" persistence-modifier="persistent"/>
       <field name="groupId" persistence-modifier="persistent"/>
       <field name="testOutputDirectory" persistence-modifier="persistent"/>
-      <field name="developers" persistence-modifier="persistent" default-fetch-group="true">
+      <!-- Collections -->
+      <field name="builds" persistence-modifier="persistent">
+        <collection element-type="ContinuumBuild" dependent-element="true"/>
+      </field>      
+      <field name="developers" persistence-modifier="persistent">
         <collection element-type="ContinuumDeveloper" dependent-element="true"/>
       </field>
-      <field name="notifiers" persistence-modifier="persistent" default-fetch-group="true">
+      <field name="notifiers" persistence-modifier="persistent">
         <collection element-type="ContinuumNotifier" dependent-element="true"/>
       </field>
-      <field name="dependencies" persistence-modifier="persistent" default-fetch-group="true">
+      <field name="dependencies" persistence-modifier="persistent">
         <collection element-type="ContinuumDependency" dependent-element="true"/>
       </field>
+      <!-- Schedules exist on their own, so we don't want cascading deletes affect them. -->
+      <field name="schedules" persistence-modifier="persistent">
+        <collection element-type="ContinuumSchedule"/>
+        <join/>
+      </field>
+      <fetch-group name="project-detail">
+        <field name="builds"/>
+        <field name="developers"/>
+        <field name="notifiers"/>
+        <field name="dependencies"/>
+        <field name="schedules"/>        
+      </fetch-group>
+    </class>
+    
+    <class name="ContinuumSchedule" detachable="true" identity-type="application">
+      <field name="projects" persistence-modifier="persistent" mapped-by="schedules">
+        <collection element-type="ContinuumProject"/>
+      </field>
+      <field name="id" persistence-modifier="persistent" null-value="exception" primary-key="true" value-strategy="native"/>
+      <field name="name" persistence-modifier="persistent"/>
+      <field name="description" persistence-modifier="persistent"/>
+      <field name="active" persistence-modifier="persistent"/>
+      <field name="scmMode" persistence-modifier="persistent"/>      
+      <field name="delay" persistence-modifier="persistent"/>      
+      <field name="cronExpression" persistence-modifier="persistent"/>            
     </class>
+    
     <class name="ContinuumNotifier" detachable="true" identity-type="datastore">
       <field name="type" persistence-modifier="persistent"/>
       <field name="configuration" persistence-modifier="persistent" default-fetch-group="true">

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=219454&r1=219453&r2=219454&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-model/src/main/resources/continuum.mdo (original)
+++ maven/continuum/trunk/continuum-model/src/main/resources/continuum.mdo Sun Jul 17 21:32:17 2005
@@ -65,12 +65,12 @@
           <name>previousBuildId</name>
           <version>1.0.0</version>
           <type>String</type>
-        </field>        
+        </field>
         <field>
           <name>buildNumber</name>
           <version>1.0.0</version>
           <type>int</type>
-        </field>        
+        </field>
         <field>
           <name>builds</name>
           <version>1.0.0</version>
@@ -157,10 +157,109 @@
             <multiplicity>*</multiplicity>
           </association>
         </field>
+        <field>
+          <name>schedules</name>
+          <version>1.0.0</version>
+          <type>Set</type>
+          <association stash.part="true">
+            <type>ContinuumSchedule</type>
+            <multiplicity>*</multiplicity>
+          </association>
+        </field>
+      </fields>
+    </class>
+
+    <class stash.storable="true">
+      <name>ContinuumSchedule</name>
+      <version>1.0.0</version>
+      <description><![CDATA[
+        Schedule for a project.
+      ]]></description>
+      <fields>
+        <field>
+          <name>projects</name>
+          <version>1.0.0</version>
+          <type>Set</type>
+          <association stash.part="true">
+            <type>ContinuumProject</type>
+            <multiplicity>*</multiplicity>
+          </association>
+        </field>
+        <field>
+          <name>id</name>
+          <version>1.0.0</version>
+          <type>String</type>
+        </field>
+        <field>
+          <name>active</name>
+          <version>1.0.0</version>
+          <type>boolean</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>
+        <!--
+         | update
+         | clean checkout
+         -->
+        <field>
+          <name>scmMode</name>
+          <version>1.0.0</version>
+          <type>int</type>
+        </field>
+        <field>
+          <name>delay</name>
+          <description><![CDATA[
+            Delay in seconds.
+          ]]></description>
+          <version>1.0.0</version>
+          <type>int</type>
+        </field>
+        <field>
+          <name>cronExpression</name>
+          <version>1.0.0</version>
+          <type>String</type>
+        </field>
       </fields>
     </class>
 
     <class stash.storable="true">
+      <name>ContinuumTrigger</name>
+      <version>1.0.0</version>
+      <description><![CDATA[
+        Schedule for a project.
+      ]]></description>
+      <fields>
+        <!--
+         | internal
+         | cron
+         -->
+        <field>
+          <name>type</name>
+          <version>1.0.0</version>
+          <type>String</type>
+        </field>
+        <!--
+         | interval = interval in seconds
+         | cron = cron syntax
+         -->
+        <field>
+          <name>specification</name>
+          <version>1.0.0</version>
+          <type>String</type>
+        </field>
+      </fields>
+    </class>
+
+
+    <class stash.storable="true">
       <name>ContinuumNotifier</name>
       <version>1.0.0</version>
       <description>
@@ -209,7 +308,7 @@
         </field>
       </fields>
     </class>
-    
+
     <class stash.storable="true">
       <name>ContinuumDependency</name>
       <version>1.0.0</version>