continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r565668 - in /maven/continuum/trunk: ./ continuum-data-management/continuum-legacy/src/main/mdo/ continuum-data-management/data-management-cli/ continuum-data-management/data-management-jdo/ continuum-data-management/data-management-jdo/src...
Date Tue, 14 Aug 2007 09:14:25 GMT
Author: evenisse
Date: Tue Aug 14 02:14:24 2007
New Revision: 565668

URL: http://svn.apache.org/viewvc?view=rev&rev=565668
Log:
[CONTINUUM-1357] add data-management

Modified:
    maven/continuum/trunk/continuum-data-management/continuum-legacy/src/main/mdo/continuum.xml
    maven/continuum/trunk/continuum-data-management/data-management-cli/pom.xml
    maven/continuum/trunk/continuum-data-management/data-management-jdo/pom.xml
    maven/continuum/trunk/continuum-data-management/data-management-jdo/src/main/java/org/apache/maven/continuum/management/JdoDataManagementTool.java
    maven/continuum/trunk/continuum-data-management/data-management-jdo/src/test/resources/expected.xml
    maven/continuum/trunk/continuum-store/src/test/java/org/apache/maven/continuum/store/AbstractContinuumStoreTestCase.java
    maven/continuum/trunk/pom.xml

Modified: maven/continuum/trunk/continuum-data-management/continuum-legacy/src/main/mdo/continuum.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-data-management/continuum-legacy/src/main/mdo/continuum.xml?view=diff&rev=565668&r1=565667&r2=565668
==============================================================================
--- maven/continuum/trunk/continuum-data-management/continuum-legacy/src/main/mdo/continuum.xml
(original)
+++ maven/continuum/trunk/continuum-data-management/continuum-legacy/src/main/mdo/continuum.xml
Tue Aug 14 02:14:24 2007
@@ -471,6 +471,14 @@
           </association>
         </field>
         <field>
+          <name>buildDefinition</name>
+          <version>1.1.0+</version>
+          <association xml.reference="true" stash.part="true" jpox.dependent="false">
+            <type>BuildDefinition</type>
+          </association>
+          <defaultValue>null</defaultValue>
+        </field>
+        <field>
           <name>id</name>
           <version>1.0.9+</version>
           <type>int</type>
@@ -545,7 +553,7 @@
         <field jpox.fetch-groups="build-result-with-details">
           <name>modifiedDependencies</name>
           <version>1.1.0+</version>
-          <association>
+          <association jpox.join="false">
             <type>ProjectDependency</type>
             <multiplicity>*</multiplicity>
           </association>
@@ -563,7 +571,7 @@
           <version>1.0.9+</version>
           <type>boolean</type>
         </field>
-        <field>
+        <field stash.maxSize="1024">
           <name>commandLine</name>
           <version>1.0.9+</version>
           <type>String</type>
@@ -706,7 +714,7 @@
       <version>1.0.9+</version>
       <fields>
         <field>
-          <name>name</name>
+          <name stash.maxSize="512">name</name>
           <version>1.0.9+</version>
           <type>String</type>
         </field>
@@ -888,7 +896,7 @@
         </field>
         <field jpox.null-value="default">
           <name>latestBuildId</name>
-          <version>1.0.9+</version>
+          <version>1.0.9</version>
           <type>int</type>
           <defaultValue>0</defaultValue>
         </field>
@@ -959,6 +967,7 @@
 
     <class jpox.table="profiles">
       <name>Profile</name>
+      <packageName>org.apache.maven.continuum.model.system</packageName>
       <version>1.1.0+</version>
       <fields>
         <field>
@@ -1006,6 +1015,15 @@
             <type>Installation</type>
           </association>
         </field>
+        <field>
+          <name>environmentVariables</name>
+          <version>1.1.0+</version>
+          <association xml.reference="true" stash.part="true" jpox.dependent="false">
+            <type>Installation</type>
+            <!-- org.apache.maven.continuum.model.system. -->
+            <multiplicity>*</multiplicity>
+          </association>
+        </field>
       </fields>
     </class>
 
@@ -1014,20 +1032,30 @@
       <packageName>org.apache.maven.continuum.model.system</packageName>
       <version>1.1.0+</version>
       <fields>
-        <field>
-          <name>version</name>
+        <field jpox.column="installationtype">
+          <name>type</name>
           <version>1.1.0+</version>
           <type>String</type>
         </field>
-        <field jpox.column="installpath">
-          <name>path</name>
+        <field jpox.column="varvalue">
+          <name>varValue</name>
           <version>1.1.0+</version>
           <type>String</type>
         </field>
-        <field jpox.primary-key="true" jpox.value-strategy="off">
+        <field jpox.column="varname">
+          <name>varName</name>
+          <version>1.1.0+</version>
+          <type>String</type>
+        </field>
+        <field>
           <name>name</name>
           <version>1.1.0+</version>
           <type>String</type>
+        </field>
+        <field jpox.primary-key="true">
+          <name>installationId</name>
+          <version>1.1.0+</version>
+          <type>int</type>
           <identifier>true</identifier>
         </field>
       </fields>
@@ -1141,8 +1169,8 @@
       </fields>
       <codeSegments>
         <codeSegment>
-          <version>1.1.0+</version>
-          <code><![CDATA[
+           <version>1.1.0+</version>
+           <code><![CDATA[
     public final static int NEW = 1;
     public final static int OK = 2;
     public final static int FAILED = 3;

Modified: maven/continuum/trunk/continuum-data-management/data-management-cli/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-data-management/data-management-cli/pom.xml?view=diff&rev=565668&r1=565667&r2=565668
==============================================================================
--- maven/continuum/trunk/continuum-data-management/data-management-cli/pom.xml (original)
+++ maven/continuum/trunk/continuum-data-management/data-management-cli/pom.xml Tue Aug 14
02:14:24 2007
@@ -61,7 +61,6 @@
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-jdo2</artifactId>
-      <version>1.0-alpha-8</version>
     </dependency>
     <dependency>
       <groupId>log4j</groupId>

Modified: maven/continuum/trunk/continuum-data-management/data-management-jdo/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-data-management/data-management-jdo/pom.xml?view=diff&rev=565668&r1=565667&r2=565668
==============================================================================
--- maven/continuum/trunk/continuum-data-management/data-management-jdo/pom.xml (original)
+++ maven/continuum/trunk/continuum-data-management/data-management-jdo/pom.xml Tue Aug 14
02:14:24 2007
@@ -37,7 +37,6 @@
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-jdo2</artifactId>
-      <version>1.0-alpha-8</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.continuum</groupId>

Modified: maven/continuum/trunk/continuum-data-management/data-management-jdo/src/main/java/org/apache/maven/continuum/management/JdoDataManagementTool.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-data-management/data-management-jdo/src/main/java/org/apache/maven/continuum/management/JdoDataManagementTool.java?view=diff&rev=565668&r1=565667&r2=565668
==============================================================================
--- maven/continuum/trunk/continuum-data-management/data-management-jdo/src/main/java/org/apache/maven/continuum/management/JdoDataManagementTool.java
(original)
+++ maven/continuum/trunk/continuum-data-management/data-management-jdo/src/main/java/org/apache/maven/continuum/management/JdoDataManagementTool.java
Tue Aug 14 02:14:24 2007
@@ -166,13 +166,13 @@
             schedules.put( Integer.valueOf( schedule.getId() ), schedule );
         }
 
-        Map<String, Installation> installations = new HashMap<String, Installation>();
+        Map<Integer, Installation> installations = new HashMap<Integer, Installation>();
         for ( Iterator i = database.getInstallations().iterator(); i.hasNext(); )
         {
             Installation installation = (Installation) i.next();
 
             installation = (Installation) PlexusJdoUtils.addObject( pmf.getPersistenceManager(),
installation );
-            installations.put( installation.getName(), installation );
+            installations.put( Integer.valueOf( installation.getInstallationId() ), installation
);
         }
 
         Map<Integer, Profile> profiles = new HashMap<Integer, Profile>();
@@ -183,11 +183,11 @@
             // process installations
             if ( profile.getJdk() != null )
             {
-                profile.setJdk( installations.get( profile.getJdk().getName() ) );
+                profile.setJdk( installations.get( profile.getJdk().getInstallationId() )
);
             }
             if ( profile.getBuilder() != null )
             {
-                profile.setBuilder( installations.get( profile.getBuilder().getName() ) );
+                profile.setBuilder( installations.get( profile.getBuilder().getInstallationId()
) );
             }
 
             profile = (Profile) PlexusJdoUtils.addObject( pmf.getPersistenceManager(), profile
);

Modified: maven/continuum/trunk/continuum-data-management/data-management-jdo/src/test/resources/expected.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-data-management/data-management-jdo/src/test/resources/expected.xml?view=diff&rev=565668&r1=565667&r2=565668
==============================================================================
--- maven/continuum/trunk/continuum-data-management/data-management-jdo/src/test/resources/expected.xml
(original)
+++ maven/continuum/trunk/continuum-data-management/data-management-jdo/src/test/resources/expected.xml
Tue Aug 14 02:14:24 2007
@@ -404,19 +404,25 @@
   </systemConfiguration>
   <installations>
     <installation>
+      <type>jdk</type>
       <varValue>/usr/local/java-1.3</varValue>
       <varName>JAVA_HOME</varName>
       <name>JDK 1.3</name>
+      <installationId>3</installationId>
     </installation>
     <installation>
+      <type>jdk</type>
       <varValue>/usr/local/java-1.4</varValue>
       <varName>JAVA_HOME</varName>
       <name>JDK 1.4</name>
+      <installationId>1</installationId>
     </installation>
     <installation>
+      <type>maven2</type>
       <varValue>/usr/local/maven-2.0-alpha-3</varValue>    
       <varName>M2_HOME</varName>
       <name>Maven 2.0 alpha 3</name>
+      <installationId>2</installationId>
     </installation>
   </installations>
   <schedules>
@@ -453,8 +459,8 @@
       <description>description1</description>
       <scmMode>1</scmMode>
       <buildWithoutChanges>true</buildWithoutChanges>
-      <jdk name="JDK 1.3"></jdk>
-      <builder name="Maven 2.0 alpha 3"></builder>
+      <jdk installationId="3"></jdk>
+      <builder installationId="2"></builder>
     </profile>
     <profile>
       <id>2</id>
@@ -462,8 +468,8 @@
       <name>name2</name>
       <description>description2</description>
       <scmMode>2</scmMode>
-      <jdk name="JDK 1.4"></jdk>
-      <builder name="Maven 2.0 alpha 3"></builder>
+      <jdk installationId="1"></jdk>
+      <builder installationId="2"></builder>
     </profile>
     <profile>
       <id>3</id>
@@ -471,8 +477,8 @@
       <description>description3</description>
       <scmMode>3</scmMode>
       <buildWithoutChanges>true</buildWithoutChanges>
-      <jdk name="JDK 1.4"></jdk>
-      <builder name="Maven 2.0 alpha 3"></builder>
+      <jdk installationId="1"></jdk>
+      <builder installationId="2"></builder>
     </profile>
   </profiles>
 </continuumDatabase>

Modified: maven/continuum/trunk/continuum-store/src/test/java/org/apache/maven/continuum/store/AbstractContinuumStoreTestCase.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-store/src/test/java/org/apache/maven/continuum/store/AbstractContinuumStoreTestCase.java?view=diff&rev=565668&r1=565667&r2=565668
==============================================================================
--- maven/continuum/trunk/continuum-store/src/test/java/org/apache/maven/continuum/store/AbstractContinuumStoreTestCase.java
(original)
+++ maven/continuum/trunk/continuum-store/src/test/java/org/apache/maven/continuum/store/AbstractContinuumStoreTestCase.java
Tue Aug 14 02:14:24 2007
@@ -19,12 +19,6 @@
  * under the License.
  */
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
 import org.apache.maven.continuum.installation.InstallationService;
 import org.apache.maven.continuum.model.project.BuildDefinition;
 import org.apache.maven.continuum.model.project.BuildResult;
@@ -44,6 +38,12 @@
 import org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory;
 import org.codehaus.plexus.jdo.JdoFactory;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
 /**
  * Base class for tests using the continuum store.
  */
@@ -130,8 +130,8 @@
         throws Exception
     {
         // Setting up test data
-        defaultProjectGroup = createTestProjectGroup( "Default Group", "The Default Group",
-                                                      "org.apache.maven.test.default" );
+        defaultProjectGroup =
+            createTestProjectGroup( "Default Group", "The Default Group", "org.apache.maven.test.default"
);
 
         testProjectGroup2 = createTestProjectGroup( "test group 2", "test group 2 desc",
"test group 2 groupId" );
 
@@ -146,10 +146,10 @@
         testSchedule2 = createTestSchedule( "name2", "description2", 2, "cronExpression2",
true );
         testSchedule3 = createTestSchedule( "name3", "description3", 3, "cronExpression3",
true );
 
-        testInstallationJava13 = createTestInstallation( "JDK 1.3", InstallationService.JDK_TYPE,
"JAVA_HOME",
-                                                         "/usr/local/java-1.3" );
-        testInstallationJava14 = createTestInstallation( "JDK 1.4", InstallationService.JDK_TYPE,
"JAVA_HOME",
-                                                         "/usr/local/java-1.4" );
+        testInstallationJava13 =
+            createTestInstallation( "JDK 1.3", InstallationService.JDK_TYPE, "JAVA_HOME",
"/usr/local/java-1.3" );
+        testInstallationJava14 =
+            createTestInstallation( "JDK 1.4", InstallationService.JDK_TYPE, "JAVA_HOME",
"/usr/local/java-1.4" );
         testInstallationMaven20a3 = createTestInstallation( "Maven 2.0 alpha 3", InstallationService.MAVEN2_TYPE,
                                                             "M2_HOME", "/usr/local/maven-2.0-alpha-3"
);
 
@@ -235,64 +235,88 @@
         {
             installationJava14 = store.addInstallation( installationJava14 );
         }
+        else
+        {
+            installationJava14.setInstallationId( 1 );
+        }
 
         Installation installationMaven20a3 = createTestInstallation( testInstallationMaven20a3
);
         if ( addToStore )
         {
             installationMaven20a3 = store.addInstallation( installationMaven20a3 );
         }
+        else
+        {
+            installationMaven20a3.setInstallationId( 2 );
+        }
 
         Installation installationJava13 = createTestInstallation( testInstallationJava13
);
         if ( addToStore )
         {
             installationJava13 = store.addInstallation( installationJava13 );
         }
+        else
+        {
+            installationJava13.setInstallationId( 3 );
+        }
 
-        testProfile1 = createTestProfile( "name1", "description1", 1, true, true, installationJava13,
-                                          installationMaven20a3 );
-        testProfile2 = createTestProfile( "name2", "description2", 2, false, true, installationJava14,
-                                          installationMaven20a3 );
-        testProfile3 = createTestProfile( "name3", "description3", 3, true, false, installationJava14,
-                                          installationMaven20a3 );
+        testProfile1 =
+            createTestProfile( "name1", "description1", 1, true, true, installationJava13,
installationMaven20a3 );
+        testProfile2 =
+            createTestProfile( "name2", "description2", 2, false, true, installationJava14,
installationMaven20a3 );
+        testProfile3 =
+            createTestProfile( "name3", "description3", 3, true, false, installationJava14,
installationMaven20a3 );
 
         Profile profile1 = createTestProfile( testProfile1 );
         if ( addToStore )
         {
             profile1 = store.addProfile( profile1 );
+            testProfile1.setId( profile1.getId() );
+        }
+        else
+        {
+            testProfile1.setId( 1 );
         }
-        testProfile1.setId( profile1.getId() );
 
         Profile profile2 = createTestProfile( testProfile2 );
         if ( addToStore )
         {
             profile2 = store.addProfile( profile2 );
+            testProfile2.setId( profile2.getId() );
+        }
+        else
+        {
+            testProfile2.setId( 2 );
         }
-        testProfile2.setId( profile2.getId() );
 
         Profile profile3 = createTestProfile( testProfile3 );
         if ( addToStore )
         {
             profile3 = store.addProfile( profile3 );
+            testProfile3.setId( profile3.getId() );
+        }
+        else
+        {
+            profile3.setId( 3 );
         }
-        testProfile3.setId( profile3.getId() );
 
-        BuildDefinition testGroupBuildDefinition1 = createTestBuildDefinition( "arguments1",
"buildFile1", "goals1",
-                                                                               profile1,
schedule2, false, false );
-        BuildDefinition testGroupBuildDefinition2 = createTestBuildDefinition( "arguments2",
"buildFile2", "goals2",
-                                                                               profile1,
schedule1, false, false );
-        BuildDefinition testGroupBuildDefinition3 = createTestBuildDefinition( "arguments3",
"buildFile3", "goals3",
-                                                                               profile2,
schedule1, false, false );
-        BuildDefinition testGroupBuildDefinition4 = createTestBuildDefinition( null, null,
"deploy", null, null, false,
-                                                                               false );
-
-        BuildDefinition testBuildDefinition1 = createTestBuildDefinition( "arguments11",
"buildFile11", "goals11",
-                                                                          profile2, schedule1,
false, false );
-        BuildDefinition testBuildDefinition2 = createTestBuildDefinition( "arguments12",
"buildFile12", "goals12",
-                                                                          profile2, schedule2,
false, false );
-        BuildDefinition testBuildDefinition3 = createTestBuildDefinition( "arguments13",
"buildFile13", "goals13",
-                                                                          profile1, schedule2,
false, false );
-        BuildDefinition testBuildDefinition4 = createTestBuildDefinition( null, null, "deploy",
null, null, false,
-                                                                          false );
+        BuildDefinition testGroupBuildDefinition1 =
+            createTestBuildDefinition( "arguments1", "buildFile1", "goals1", profile1, schedule2,
false, false );
+        BuildDefinition testGroupBuildDefinition2 =
+            createTestBuildDefinition( "arguments2", "buildFile2", "goals2", profile1, schedule1,
false, false );
+        BuildDefinition testGroupBuildDefinition3 =
+            createTestBuildDefinition( "arguments3", "buildFile3", "goals3", profile2, schedule1,
false, false );
+        BuildDefinition testGroupBuildDefinition4 =
+            createTestBuildDefinition( null, null, "deploy", null, null, false, false );
+
+        BuildDefinition testBuildDefinition1 =
+            createTestBuildDefinition( "arguments11", "buildFile11", "goals11", profile2,
schedule1, false, false );
+        BuildDefinition testBuildDefinition2 =
+            createTestBuildDefinition( "arguments12", "buildFile12", "goals12", profile2,
schedule2, false, false );
+        BuildDefinition testBuildDefinition3 =
+            createTestBuildDefinition( "arguments13", "buildFile13", "goals13", profile1,
schedule2, false, false );
+        BuildDefinition testBuildDefinition4 =
+            createTestBuildDefinition( null, null, "deploy", null, null, false, false );
 
         ProjectGroup group = createTestProjectGroup( defaultProjectGroup );
 
@@ -640,8 +664,8 @@
     {
         return createTestBuildDefinition( buildDefinition.getArguments(), buildDefinition.getBuildFile(),
                                           buildDefinition.getGoals(), buildDefinition.getProfile(),
buildDefinition
-                                              .getSchedule(), buildDefinition.isDefaultForProject(),
buildDefinition
-                                              .isBuildFresh() );
+            .getSchedule(), buildDefinition.isDefaultForProject(), buildDefinition
+            .isBuildFresh() );
     }
 
     protected static BuildDefinition createTestBuildDefinition( String arguments, String
buildFile, String goals,
@@ -685,8 +709,8 @@
 
     private static ScmResult createTestScmResult( ScmResult scmResult, String base )
     {
-        return createTestScmResult( scmResult.getCommandOutput(), scmResult.getProviderMessage(),
-                                    scmResult.isSuccess(), base );
+        return createTestScmResult( scmResult.getCommandOutput(), scmResult.getProviderMessage(),
scmResult.isSuccess(),
+                                    base );
     }
 
     private static ScmResult createTestScmResult( String commandOutput, String providerMessage,
boolean success,
@@ -752,6 +776,7 @@
     {
         Installation installation = new Installation();
         installation.setName( name );
+        installation.setType( type );
         installation.setVarName( varName );
         installation.setVarValue( varValue );
         return installation;
@@ -784,7 +809,8 @@
     protected static Profile createTestProfile( Profile profile )
     {
         return createTestProfile( profile.getName(), profile.getDescription(), profile.getScmMode(),
profile
-            .isBuildWithoutChanges(), profile.isActive(), profile.getJdk(), profile.getBuilder()
);
+            .isBuildWithoutChanges(), profile.isActive(), profile.getJdk(), profile.getBuilder(),
+                                      profile.getEnvironmentVariables() );
 //                                  createTestInstallation( profile.getJdk() ),
 //                                  createTestInstallation( profile.getBuilder() ) );
     }
@@ -793,17 +819,9 @@
                                                 boolean buildWithoutChanges, boolean active,
Installation jdk,
                                                 Installation builder )
     {
-        Profile profile = new Profile();
-        profile.setActive( active );
-        profile.setBuildWithoutChanges( buildWithoutChanges );
-        profile.setScmMode( scmMode );
-        profile.setDescription( description );
-        profile.setName( name );
-        profile.setBuilder( builder );
-        profile.setJdk( jdk );
-        return profile;
+        return createTestProfile( name, description, scmMode, buildWithoutChanges, active,
jdk, builder, null );
     }
-    
+
     protected static Profile createTestProfile( String name, String description, int scmMode,
                                                 boolean buildWithoutChanges, boolean active,
Installation jdk,
                                                 Installation builder, List envVars )
@@ -867,7 +885,8 @@
         assertEquals( "compare expectedProject - name", expectedProject.getName(), project.getName()
);
         assertEquals( "compare expectedProject - desc", expectedProject.getDescription(),
project.getDescription() );
         assertEquals( "compare expectedProject - groupId", expectedProject.getGroupId(),
project.getGroupId() );
-        assertEquals( "compare expectedProject - artifactId", expectedProject.getArtifactId(),
project.getArtifactId() );
+        assertEquals( "compare expectedProject - artifactId", expectedProject.getArtifactId(),
+                      project.getArtifactId() );
         assertEquals( "compare expectedProject - buildNumber", expectedProject.getBuildNumber(),
project
             .getBuildNumber() );
         assertEquals( "compare expectedProject - scmUrl", expectedProject.getScmUrl(), project.getScmUrl()
);
@@ -896,7 +915,8 @@
             assertNotSame( expectedSchedule, actualSchedule );
             assertEquals( "compare schedule - id", expectedSchedule.getId(), actualSchedule.getId()
);
             assertEquals( "compare schedule - name", expectedSchedule.getName(), actualSchedule.getName()
);
-            assertEquals( "compare schedule - desc", expectedSchedule.getDescription(), actualSchedule.getDescription()
);
+            assertEquals( "compare schedule - desc", expectedSchedule.getDescription(),
+                          actualSchedule.getDescription() );
             assertEquals( "compare schedule - delay", expectedSchedule.getDelay(), actualSchedule.getDelay()
);
             assertEquals( "compare schedule - cron", expectedSchedule.getCronExpression(),
actualSchedule
                 .getCronExpression() );
@@ -946,7 +966,8 @@
         assertEquals( "compare SCM result - changes size", actual.getChanges().size(), expected.getChanges().size()
);
         for ( int i = 0; i < actual.getChanges().size(); i++ )
         {
-            assertChangeSetEquals( (ChangeSet) expected.getChanges().get( i ), (ChangeSet)
actual.getChanges().get( i ) );
+            assertChangeSetEquals( (ChangeSet) expected.getChanges().get( i ),
+                                   (ChangeSet) actual.getChanges().get( i ) );
         }
     }
 
@@ -959,7 +980,8 @@
         assertEquals( "compare change set result - files size", expected.getFiles().size(),
actual.getFiles().size() );
         for ( int i = 0; i < actual.getFiles().size(); i++ )
         {
-            assertChangeFileEquals( (ChangeFile) expected.getFiles().get( i ), (ChangeFile)
actual.getFiles().get( i ) );
+            assertChangeFileEquals( (ChangeFile) expected.getFiles().get( i ),
+                                    (ChangeFile) actual.getFiles().get( i ) );
         }
     }
 
@@ -1088,7 +1110,8 @@
     protected ContinuumStore createStore()
         throws Exception
     {
-        DefaultConfigurableJdoFactory jdoFactory = (DefaultConfigurableJdoFactory) lookup(
JdoFactory.ROLE, "continuum" );
+        DefaultConfigurableJdoFactory jdoFactory =
+            (DefaultConfigurableJdoFactory) lookup( JdoFactory.ROLE, "continuum" );
 
         jdoFactory.setUrl( "jdbc:hsqldb:mem:" + getName() );
 

Modified: maven/continuum/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/pom.xml?view=diff&rev=565668&r1=565667&r2=565668
==============================================================================
--- maven/continuum/trunk/pom.xml (original)
+++ maven/continuum/trunk/pom.xml Tue Aug 14 02:14:24 2007
@@ -31,6 +31,9 @@
   <name>Continuum Project</name>
   <version>1.1-beta-2-SNAPSHOT</version>
   <url>http://maven.apache.org/continuum</url>
+  <prerequisites>
+    <maven>2.0.7</maven>
+  </prerequisites>
   <issueManagement>
     <system>jira</system>
     <url>http://jira.codehaus.org/browse/CONTINUUM</url>
@@ -125,9 +128,7 @@
     <module>continuum-webapp</module>
     <module>continuum-xmlrpc</module>
     <module>continuum-release</module>
-    <!-- Disabled until we can pre-req 2.0.7 - that fixes the bug where it doesn't work
in the reactor
     <module>continuum-data-management</module>
--->
     <module>continuum-configuration</module>
     <module>maven-continuum-plugin</module>
   </modules>



Mime
View raw message