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 2006/04/14 12:16:47 UTC
svn commit: r394059 - in /maven/continuum/branches/continuum-1.0.x: ./
continuum-core/ continuum-plexus-application/src/conf/
continuum-store/src/test/java/org/apache/maven/continuum/store/
continuum-test/
Author: evenisse
Date: Fri Apr 14 03:16:42 2006
New Revision: 394059
URL: http://svn.apache.org/viewcvs?rev=394059&view=rev
Log:
Use snapshot version of jpox rc2 (with patch http://www.jpox.org/servlet/jira/browse/CORE-2771 applied).
Modified:
maven/continuum/branches/continuum-1.0.x/continuum-core/pom.xml
maven/continuum/branches/continuum-1.0.x/continuum-plexus-application/src/conf/application.xml
maven/continuum/branches/continuum-1.0.x/continuum-store/src/test/java/org/apache/maven/continuum/store/ContinuumStoreTest.java
maven/continuum/branches/continuum-1.0.x/continuum-test/pom.xml
maven/continuum/branches/continuum-1.0.x/pom.xml
Modified: maven/continuum/branches/continuum-1.0.x/continuum-core/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-core/pom.xml?rev=394059&r1=394058&r2=394059&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-core/pom.xml (original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-core/pom.xml Fri Apr 14 03:16:42 2006
@@ -20,7 +20,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>jpox</groupId>
+ <groupId>org.apache.maven.continuum.jpox</groupId>
<artifactId>jpox</artifactId>
</dependency>
<dependency>
Modified: maven/continuum/branches/continuum-1.0.x/continuum-plexus-application/src/conf/application.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-plexus-application/src/conf/application.xml?rev=394059&r1=394058&r2=394059&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-plexus-application/src/conf/application.xml (original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-plexus-application/src/conf/application.xml Fri Apr 14 03:16:42 2006
@@ -286,6 +286,11 @@
<name>org.jpox.autoStartMechanismMode</name>
<value>Ignored</value>
</property>
+ <!-- This property is for compatibility with database created with old jpox because rc2 use 256 as default (jdo standard) -->
+ <property>
+ <name>org.jpox.rdbms.stringDefaultLength</name>
+ <value>255</value>
+ </property>
<!-- Apache Derby Configuration -->
<property>
<name>javax.jdo.option.ConnectionDriverName</name>
Modified: maven/continuum/branches/continuum-1.0.x/continuum-store/src/test/java/org/apache/maven/continuum/store/ContinuumStoreTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-store/src/test/java/org/apache/maven/continuum/store/ContinuumStoreTest.java?rev=394059&r1=394058&r2=394059&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-store/src/test/java/org/apache/maven/continuum/store/ContinuumStoreTest.java (original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-store/src/test/java/org/apache/maven/continuum/store/ContinuumStoreTest.java Fri Apr 14 03:16:42 2006
@@ -981,7 +981,8 @@
Project project = store.getProjectWithAllDetails( testProject1.getId() );
ProjectNotifier newNotifier = (ProjectNotifier) project.getNotifiers().get( 0 );
- String type = "type1.1";
+ // If we use "type1.1", jpox-rc2 store "type11", weird
+ String type = "type11";
newNotifier.setType( type );
ProjectNotifier copy = createTestNotifier( newNotifier );
@@ -1033,7 +1034,8 @@
Project project = store.getProjectWithAllDetails( testProject1.getId() );
BuildDefinition newBuildDefinition = (BuildDefinition) project.getBuildDefinitions().get( 0 );
- String arguments = "arguments1.1";
+ // If we use "arguments1.1", jpox-rc2 store "arguments11", weird
+ String arguments = "arguments11";
newBuildDefinition.setArguments( arguments );
BuildDefinition copy = createTestBuildDefinition( newBuildDefinition );
@@ -1088,7 +1090,8 @@
ProjectGroup projectGroup = store.getProjectGroupWithBuildDetails( defaultProjectGroup.getId() );
ProjectNotifier newNotifier = (ProjectNotifier) projectGroup.getNotifiers().get( 0 );
- String type = "type1.1";
+ // If we use "type1.1", jpox-rc2 store "type1", weird
+ String type = "type1";
newNotifier.setType( type );
ProjectNotifier copy = createTestNotifier( newNotifier );
@@ -1142,7 +1145,8 @@
ProjectGroup projectGroup = store.getProjectGroupWithBuildDetails( defaultProjectGroup.getId() );
BuildDefinition newBuildDefinition = (BuildDefinition) projectGroup.getBuildDefinitions().get( 0 );
- String arguments = "arguments1.1";
+ // If we use "arguments1.1", jpox-rc2 store "arguments11", weird
+ String arguments = "arguments1";
newBuildDefinition.setArguments( arguments );
BuildDefinition copy = createTestBuildDefinition( newBuildDefinition );
Modified: maven/continuum/branches/continuum-1.0.x/continuum-test/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-test/pom.xml?rev=394059&r1=394058&r2=394059&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-test/pom.xml (original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-test/pom.xml Fri Apr 14 03:16:42 2006
@@ -19,7 +19,7 @@
<artifactId>plexus-jdo2</artifactId>
</dependency>
<dependency>
- <groupId>jpox</groupId>
+ <groupId>org.apache.maven.continuum.jpox</groupId>
<artifactId>jpox-enhancer</artifactId>
</dependency>
<dependency>
Modified: maven/continuum/branches/continuum-1.0.x/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/pom.xml?rev=394059&r1=394058&r2=394059&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/pom.xml (original)
+++ maven/continuum/branches/continuum-1.0.x/pom.xml Fri Apr 14 03:16:42 2006
@@ -253,9 +253,9 @@
<version>1.0.3-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>jpox</groupId>
+ <groupId>org.apache.maven.continuum.jpox</groupId>
<artifactId>jpox</artifactId>
- <version>1.1.0-rc-1</version>
+ <version>1.1.0-20060413</version>
<exclusions>
<exclusion>
<artifactId>ant</artifactId>
@@ -280,14 +280,20 @@
</exclusions>
</dependency>
<dependency>
- <groupId>jpox</groupId>
+ <groupId>org.apache.maven.continuum.jpox</groupId>
<artifactId>jpox-enhancer</artifactId>
- <version>1.1.0-rc-1</version>
+ <version>1.1.0-20060413</version>
</dependency>
<dependency>
<groupId>jpox</groupId>
<artifactId>jpox-dbcp</artifactId>
<version>1.1.0-rc-1</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>jpox</artifactId>
+ <groupId>jpox</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>