You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ev...@apache.org on 2005/08/24 00:15:46 UTC
svn commit: r239465 - in /maven/continuum/trunk: continuum-model/
continuum-model/src/main/mdo/ continuum-model/src/main/resources/
continuum-store/src/test/java/org/apache/maven/continuum/store/
continuum-test/src/main/java/org/apache/maven/continuum/
Author: evenisse
Date: Tue Aug 23 15:15:33 2005
New Revision: 239465
URL: http://svn.apache.org/viewcvs?rev=239465&view=rev
Log:
[CONTINUUM-295]. Generate package.jdo with modello jpox plugin
Removed:
maven/continuum/trunk/continuum-model/src/main/resources/
Modified:
maven/continuum/trunk/continuum-model/pom.xml
maven/continuum/trunk/continuum-model/src/main/mdo/continuum.mdo
maven/continuum/trunk/continuum-store/src/test/java/org/apache/maven/continuum/store/ContinuumStoreTest.java
maven/continuum/trunk/continuum-test/src/main/java/org/apache/maven/continuum/AbstractContinuumTest.java
Modified: maven/continuum/trunk/continuum-model/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-model/pom.xml?rev=239465&r1=239464&r2=239465&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-model/pom.xml (original)
+++ maven/continuum/trunk/continuum-model/pom.xml Tue Aug 23 15:15:33 2005
@@ -42,8 +42,8 @@
<execution>
<goals>
<goal>java</goal>
- <!--
<goal>jpox-jdo-mapping</goal>
+ <!--
<goal>jpox-store</goal>
-->
</goals>
Modified: maven/continuum/trunk/continuum-model/src/main/mdo/continuum.mdo
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-model/src/main/mdo/continuum.mdo?rev=239465&r1=239464&r2=239465&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-model/src/main/mdo/continuum.mdo (original)
+++ maven/continuum/trunk/continuum-model/src/main/mdo/continuum.mdo Tue Aug 23 15:15:33 2005
@@ -40,15 +40,15 @@
<version>1.0.0+</version>
<type>String</type>
</field>
- <field>
+ <field jpox.mappedBy="projectGroup">
<name>projects</name>
<version>1.0.0+</version>
- <association>
+ <association stash.part="true" jpox.join="false">
<type>Project</type>
<multiplicity>*</multiplicity>
</association>
</field>
- <field>
+ <field jpox.fetchGroupNames="project-build-details">
<name>notifiers</name>
<version>1.0.0+</version>
<association>
@@ -56,7 +56,7 @@
<multiplicity>*</multiplicity>
</association>
</field>
- <field>
+ <field jpox.fetchGroupNames="project-build-details">
<name>buildDefinitions</name>
<version>1.0.0+</version>
<association>
@@ -141,34 +141,34 @@
<version>1.0.0+</version>
<type>String</type>
</field>
- <field>
+ <field jpox.mappedBy="project" jpox.fetchGroupNames="project-with-builds">
<name>buildResults</name>
<version>1.0.0+</version>
- <association>
+ <association jpox.join="false">
<type>BuildResult</type>
<multiplicity>*</multiplicity>
</association>
</field>
<!-- TODO: remove -->
- <field>
+ <field jpox.fetchGroupNames="project-with-checkout-result">
<name>checkoutResult</name>
<version>1.0.0+</version>
<association>
<type>ScmResult</type>
</association>
</field>
- <field>
+ <field jpox.fetchGroupNames="project-all-details">
<name>developers</name>
<version>1.0.0+</version>
- <association>
+ <association jpox.join="false">
<type>ProjectDeveloper</type>
<multiplicity>*</multiplicity>
</association>
</field>
- <field>
+ <field jpox.fetchGroupNames="project-all-details">
<name>dependencies</name>
<version>1.0.0+</version>
- <association>
+ <association jpox.join="false">
<type>ProjectDependency</type>
<multiplicity>*</multiplicity>
</association>
@@ -176,11 +176,12 @@
<field>
<name>projectGroup</name>
<version>1.0.0+</version>
- <association>
+ <required>true</required>
+ <association stash.part="true" jpox.dependent="false">
<type>ProjectGroup</type>
</association>
</field>
- <field>
+ <field jpox.fetchGroupNames="project-build-details project-all-details">
<name>notifiers</name>
<version>1.0.0+</version>
<association>
@@ -188,7 +189,7 @@
<multiplicity>*</multiplicity>
</association>
</field>
- <field>
+ <field jpox.fetchGroupNames="project-build-details project-all-details">
<name>buildDefinitions</name>
<version>1.0.0+</version>
<association>
@@ -305,8 +306,8 @@
<field>
<name>project</name>
<version>1.0.0+</version>
- <required>true</required>
- <association>
+ <!-- required>true</required -->
+ <association stash.part="true" jpox.dependent="false">
<type>Project</type>
</association>
</field>
@@ -358,7 +359,7 @@
<version>1.0.0+</version>
<type>int</type>
</field>
- <field>
+ <field jpox.fetchGroupNames="build-result-with-details">
<name>scmResult</name>
<version>1.0.0+</version>
<association>
@@ -389,7 +390,7 @@
<version>1.0.0+</version>
<type>String</type>
</field>
- <field>
+ <field stash.maxSize="8192">
<name>exception</name>
<version>1.0.0+</version>
<type>String</type>
@@ -397,7 +398,7 @@
<field>
<name>changes</name>
<version>1.0.0+</version>
- <association>
+ <association stash.part="true" jpox.join="false">
<type>ChangeSet</type>
<multiplicity>*</multiplicity>
</association>
@@ -429,7 +430,7 @@
<field>
<name>files</name>
<version>1.0.0+</version>
- <association>
+ <association stash.part="true" jpox.join="false">
<type>ChangeFile</type>
<multiplicity>*</multiplicity>
</association>
@@ -477,14 +478,14 @@
<field>
<name>schedule</name>
<version>1.0.0+</version>
- <association>
+ <association stash.part="true" jpox.dependent="false">
<type>Schedule</type>
</association>
</field>
<field>
<name>profile</name>
<version>1.0.0+</version>
- <association>
+ <association stash.part="true" jpox.dependent="false">
<type>Profile</type>
</association>
</field>
@@ -573,14 +574,14 @@
<field>
<name>jdk</name>
<version>1.0.0+</version>
- <association>
+ <association stash.part="true" jpox.dependent="false">
<type>Installation</type>
</association>
</field>
<field>
<name>builder</name>
<version>1.0.0+</version>
- <association>
+ <association stash.part="true" jpox.dependent="false">
<type>Installation</type>
</association>
</field>
Modified: maven/continuum/trunk/continuum-store/src/test/java/org/apache/maven/continuum/store/ContinuumStoreTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-store/src/test/java/org/apache/maven/continuum/store/ContinuumStoreTest.java?rev=239465&r1=239464&r2=239465&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-store/src/test/java/org/apache/maven/continuum/store/ContinuumStoreTest.java (original)
+++ maven/continuum/trunk/continuum-store/src/test/java/org/apache/maven/continuum/store/ContinuumStoreTest.java Tue Aug 23 15:15:33 2005
@@ -1768,7 +1768,7 @@
System.setProperty( (String) entry.getKey(), (String) entry.getValue() );
}
- File file = getTestFile( "../continuum-model/src/main/resources/META-INF/package.jdo" );
+ File file = getTestFile( "../continuum-model/target/classes/META-INF/package.jdo" );
SchemaTool.createSchemaTables( new String[]{file.getAbsolutePath()}, false );
PersistenceManagerFactory pmf = jdoFactory.getPersistenceManagerFactory();
Modified: maven/continuum/trunk/continuum-test/src/main/java/org/apache/maven/continuum/AbstractContinuumTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-test/src/main/java/org/apache/maven/continuum/AbstractContinuumTest.java?rev=239465&r1=239464&r2=239465&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-test/src/main/java/org/apache/maven/continuum/AbstractContinuumTest.java (original)
+++ maven/continuum/trunk/continuum-test/src/main/java/org/apache/maven/continuum/AbstractContinuumTest.java Tue Aug 23 15:15:33 2005
@@ -126,7 +126,7 @@
System.setProperty( (String) entry.getKey(), (String) entry.getValue() );
}
- File file = getTestFile( "../continuum-model/src/main/resources/META-INF/package.jdo" );
+ File file = getTestFile( "../continuum-model/target/classes/META-INF/package.jdo" );
SchemaTool.createSchemaTables( new String[]{file.getAbsolutePath()}, false );
// ----------------------------------------------------------------------