You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by tr...@apache.org on 2005/08/01 03:29:08 UTC
svn commit: r226714 - in /maven/continuum/branches/trygvis-test: ./
continuum-api/src/main/java/org/apache/maven/continuum/utils/
continuum-api/src/test/ continuum-api/src/test/java/
continuum-api/src/test/java/org/ continuum-api/src/test/java/org/apac...
Author: trygvis
Date: Sun Jul 31 18:28:31 2005
New Revision: 226714
URL: http://svn.apache.org/viewcvs?rev=226714&view=rev
Log:
o Adding some utility scripts for debugging Derby and for creating the schema.
o Removing CLOB references. Will instead just store the exception messages in
the columns instead of the entire stack trace.
o Adding table names to all classes.
o Removing ContinuumCoreTest.
o Adding explicit imports on the queries. Silences some JPOX warnings.
Added:
maven/continuum/branches/trygvis-test/continuum-api/src/test/
maven/continuum/branches/trygvis-test/continuum-api/src/test/java/
maven/continuum/branches/trygvis-test/continuum-api/src/test/java/org/
maven/continuum/branches/trygvis-test/continuum-api/src/test/java/org/apache/
maven/continuum/branches/trygvis-test/continuum-api/src/test/java/org/apache/maven/
maven/continuum/branches/trygvis-test/continuum-api/src/test/java/org/apache/maven/continuum/
maven/continuum/branches/trygvis-test/continuum-api/src/test/java/org/apache/maven/continuum/utils/
maven/continuum/branches/trygvis-test/continuum-api/src/test/java/org/apache/maven/continuum/utils/ContinuumUtilsTest.java (with props)
maven/continuum/branches/trygvis-test/continuum-model/create-schema.sh (with props)
maven/continuum/branches/trygvis-test/continuum-model/db-settings
maven/continuum/branches/trygvis-test/continuum-model/run-derby.sh (with props)
maven/continuum/branches/trygvis-test/continuum-test/src/main/resources/
maven/continuum/branches/trygvis-test/continuum-test/src/main/resources/META-INF/
maven/continuum/branches/trygvis-test/continuum-test/src/main/resources/META-INF/plexus/
maven/continuum/branches/trygvis-test/continuum-test/src/main/resources/META-INF/plexus/components.xml (with props)
Removed:
maven/continuum/branches/trygvis-test/continuum-core/src/test/java/org/apache/maven/continuum/core/
Modified:
maven/continuum/branches/trygvis-test/continuum-api/src/main/java/org/apache/maven/continuum/utils/ContinuumUtils.java
maven/continuum/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/build/settings/DefaultBuildSettingsActivator.java
maven/continuum/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/scheduler/DefaultContinuumScheduler.java
maven/continuum/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java
maven/continuum/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/utils/shell/DefaultShellCommandHelper.java
maven/continuum/branches/trygvis-test/continuum-core/src/main/resources/META-INF/plexus/components.xml
maven/continuum/branches/trygvis-test/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumTest.java
maven/continuum/branches/trygvis-test/continuum-core/src/test/java/org/apache/maven/continuum/execution/manager/DefaultBuildExecutorManagerTest.java
maven/continuum/branches/trygvis-test/continuum-core/src/test/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutorTest.java
maven/continuum/branches/trygvis-test/continuum-core/src/test/java/org/apache/maven/continuum/scm/ContinuumScmTest.java
maven/continuum/branches/trygvis-test/continuum-core/src/test/java/org/apache/maven/continuum/store/AbstractContinuumStoreTest.java
maven/continuum/branches/trygvis-test/continuum-core/src/test/resources/log4j.properties
maven/continuum/branches/trygvis-test/continuum-model/dump-ddl.sh
maven/continuum/branches/trygvis-test/continuum-model/src/main/resources/META-INF/package.jdo
maven/continuum/branches/trygvis-test/continuum-plexus-application/plexus-jamvm.sh
maven/continuum/branches/trygvis-test/continuum-plexus-application/plexus-kaffe.sh
maven/continuum/branches/trygvis-test/continuum-plexus-application/plexus-sablevm.sh
maven/continuum/branches/trygvis-test/continuum-plexus-application/src/conf/application.xml
maven/continuum/branches/trygvis-test/continuum-test/pom.xml
maven/continuum/branches/trygvis-test/continuum-test/src/main/java/org/apache/maven/continuum/AbstractContinuumTest.java
maven/continuum/branches/trygvis-test/pom.xml
Modified: maven/continuum/branches/trygvis-test/continuum-api/src/main/java/org/apache/maven/continuum/utils/ContinuumUtils.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-api/src/main/java/org/apache/maven/continuum/utils/ContinuumUtils.java?rev=226714&r1=226713&r2=226714&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-api/src/main/java/org/apache/maven/continuum/utils/ContinuumUtils.java (original)
+++ maven/continuum/branches/trygvis-test/continuum-api/src/main/java/org/apache/maven/continuum/utils/ContinuumUtils.java Sun Jul 31 18:28:31 2005
@@ -1,7 +1,7 @@
package org.apache.maven.continuum.utils;
/*
- * Copyright 2004-2005 The Apache Software Foundation.
+ * Copyright 2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -25,6 +25,8 @@
*/
public class ContinuumUtils
{
+ public static final String EOL = System.getProperty( "line.separator" );
+
public static String throwableToString( Throwable error )
{
if ( error == null )
@@ -41,5 +43,30 @@
printer.flush();
return writer.getBuffer().toString();
+ }
+
+ public static String throwableMessagesToString( Throwable error )
+ {
+ if ( error == null )
+ {
+ return "";
+ }
+
+ StringBuffer buffer = new StringBuffer();
+
+ buffer.append( error.getMessage() );
+
+ error = error.getCause();
+
+ while ( error != null )
+ {
+ buffer.append( EOL );
+
+ buffer.append( error.getMessage() );
+
+ error = error.getCause();
+ }
+
+ return buffer.toString();
}
}
Added: maven/continuum/branches/trygvis-test/continuum-api/src/test/java/org/apache/maven/continuum/utils/ContinuumUtilsTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-api/src/test/java/org/apache/maven/continuum/utils/ContinuumUtilsTest.java?rev=226714&view=auto
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-api/src/test/java/org/apache/maven/continuum/utils/ContinuumUtilsTest.java (added)
+++ maven/continuum/branches/trygvis-test/continuum-api/src/test/java/org/apache/maven/continuum/utils/ContinuumUtilsTest.java Sun Jul 31 18:28:31 2005
@@ -0,0 +1,40 @@
+package org.apache.maven.continuum.utils;
+
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import junit.framework.TestCase;
+
+/**
+ * @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
+ * @version $Id$
+ */
+public class ContinuumUtilsTest
+ extends TestCase
+{
+ public void testThrowableMessagesToString()
+ {
+ Throwable a = new Exception( "bar" );
+
+ Throwable b = new Exception( "foo", a );
+
+ assertEquals( "bar",
+ ContinuumUtils.throwableMessagesToString( a ) );
+
+ assertEquals( "foo" + ContinuumUtils.EOL + "bar",
+ ContinuumUtils.throwableMessagesToString( b ) );
+ }
+}
Propchange: maven/continuum/branches/trygvis-test/continuum-api/src/test/java/org/apache/maven/continuum/utils/ContinuumUtilsTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/continuum/branches/trygvis-test/continuum-api/src/test/java/org/apache/maven/continuum/utils/ContinuumUtilsTest.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: maven/continuum/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/build/settings/DefaultBuildSettingsActivator.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/build/settings/DefaultBuildSettingsActivator.java?rev=226714&r1=226713&r2=226714&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/build/settings/DefaultBuildSettingsActivator.java (original)
+++ maven/continuum/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/build/settings/DefaultBuildSettingsActivator.java Sun Jul 31 18:28:31 2005
@@ -1,16 +1,33 @@
package org.apache.maven.continuum.build.settings;
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
import org.apache.maven.continuum.Continuum;
import org.apache.maven.continuum.project.ContinuumBuildSettings;
import org.apache.maven.continuum.scheduler.ContinuumBuildJob;
import org.apache.maven.continuum.scheduler.ContinuumScheduler;
+import org.apache.maven.continuum.scheduler.ContinuumSchedulerException;
import org.apache.maven.continuum.store.ContinuumStore;
import org.apache.maven.continuum.store.ContinuumStoreException;
import org.codehaus.plexus.logging.AbstractLogEnabled;
+import org.codehaus.plexus.util.StringUtils;
import org.quartz.CronTrigger;
import org.quartz.JobDataMap;
import org.quartz.JobDetail;
-import org.quartz.Job;
import org.quartz.Scheduler;
import java.text.ParseException;
@@ -52,6 +69,15 @@
{
ContinuumBuildSettings buildSettings = (ContinuumBuildSettings) i.next();
+ if ( StringUtils.isEmpty( buildSettings.getCronExpression() ) )
+ {
+ // TODO: this can possibly be removed but it's here now to
+ // weed out any bugs
+ getLogger().info( "Not scheduling " + buildSettings.getName() );
+
+ continue;
+ }
+
scheduleBuildSettings( buildSettings, continuum );
}
}
@@ -82,7 +108,7 @@
trigger.setGroup( Scheduler.DEFAULT_GROUP );
- Date startTime = new Date( System.currentTimeMillis() + ( delay * 1000 ) );
+ Date startTime = new Date( System.currentTimeMillis() + delay * 1000 );
trigger.setStartTime( startTime );
@@ -103,7 +129,7 @@
getLogger().info( trigger.getNextFireTime() + "" );
}
- catch ( Exception e )
+ catch ( ContinuumSchedulerException e )
{
throw new BuildSettingsActivationException( "Cannot schedule build job.", e );
}
Modified: maven/continuum/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/scheduler/DefaultContinuumScheduler.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/scheduler/DefaultContinuumScheduler.java?rev=226714&r1=226713&r2=226714&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/scheduler/DefaultContinuumScheduler.java (original)
+++ maven/continuum/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/scheduler/DefaultContinuumScheduler.java Sun Jul 31 18:28:31 2005
@@ -48,7 +48,7 @@
public boolean jobExists( String jobName, String jobGroup )
throws ContinuumSchedulerException
{
- String[] jobNames = null;
+ String[] jobNames;
try
{
@@ -63,9 +63,10 @@
{
String name = jobNames[i];
- if ( jobName.equals( name ) );
-
- return true;
+ if ( jobName.equals( name ) )
+ {
+ return true;
+ }
}
return false;
@@ -74,9 +75,6 @@
/**
* Create job detail for a build job. The detail contains a map of objects that can be utilized
* by the executing job.
- *
- * @param schedule
- * @return
*/
protected JobDetail createJobDetail( ContinuumSchedule schedule )
{
@@ -90,9 +88,6 @@
/**
* Create Job data map for a build job. The map of objects created can be utilized by
* the executing job.
- *
- * @param schedule
- * @return
*/
protected JobDataMap createJobDataMap( ContinuumSchedule schedule )
{
@@ -123,7 +118,7 @@
trigger.setGroup( Scheduler.DEFAULT_GROUP );
- Date startTime = new Date( System.currentTimeMillis() + ( schedule.getDelay() * 1000 ) );
+ Date startTime = new Date( System.currentTimeMillis() + schedule.getDelay() * 1000 );
trigger.setStartTime( startTime );
Modified: maven/continuum/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java?rev=226714&r1=226713&r2=226714&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java (original)
+++ maven/continuum/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java Sun Jul 31 18:28:31 2005
@@ -165,6 +165,24 @@
public ContinuumProject updateProject( ContinuumProject project )
throws ContinuumStoreException
{
+ String checkoutErrorMessage = project.getCheckOutErrorMessage();
+
+ String checkoutErrorException = project.getCheckOutErrorException();
+
+ if ( checkoutErrorMessage != null && checkoutErrorMessage.length() > 255 )
+ {
+ project.setCheckOutErrorMessage( checkoutErrorMessage.substring( 0, 255 ) );
+ }
+
+ if ( checkoutErrorException != null && checkoutErrorException.length() > 255 )
+ {
+ project.setCheckOutErrorException( checkoutErrorException.substring( 0, 255 ) );
+ }
+
+ // ----------------------------------------------------------------------
+ //
+ // ----------------------------------------------------------------------
+
PersistenceManager pm = pmf.getPersistenceManager();
Transaction tx = pm.currentTransaction();
@@ -178,15 +196,15 @@
// of schedules or they don't get saved.
// ----------------------------------------------------------------------
- if ( project.getSchedules() != null && project.getSchedules().size() > 0 )
- {
- pm.attachCopyAll( project.getSchedules(), true );
- }
+// if ( project.getSchedules() != null && project.getSchedules().size() > 0 )
+// {
+// pm.attachCopyAll( project.getSchedules(), true );
+// }
- if ( project.getBuildGroups() != null && project.getBuildGroups().size() > 0 )
- {
- pm.attachCopyAll( project.getBuildGroups(), true );
- }
+// if ( project.getBuildGroups() != null && project.getBuildGroups().size() > 0 )
+// {
+// pm.attachCopyAll( project.getBuildGroups(), true );
+// }
// if ( project.getProjectGroup() != null )
// {
@@ -263,6 +281,8 @@
Query query = pm.newQuery( extent );
+ query.declareImports( "import java.lang.String" );
+
query.declareParameters( "String name" );
query.setFilter( "this.name == name" );
@@ -305,6 +325,8 @@
Query query = pm.newQuery( extent );
+ query.declareImports( "import java.lang.String" );
+
query.declareParameters( "String scmUrl" );
query.setFilter( "this.scmUrl == scmUrl" );
@@ -647,6 +669,8 @@
query.setFilter( "this.project.id == id" );
+ query.declareImports( "import java.lang.String" );
+
query.declareParameters( "String id" );
query.setOrdering( "startTime descending" );
@@ -1208,6 +1232,8 @@
Extent extent = pm.getExtent( clazz, true );
Query query = pm.newQuery( extent );
+
+ query.declareImports( "import java.lang.String" );
query.declareParameters( "String " + idField );
Modified: maven/continuum/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/utils/shell/DefaultShellCommandHelper.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/utils/shell/DefaultShellCommandHelper.java?rev=226714&r1=226713&r2=226714&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/utils/shell/DefaultShellCommandHelper.java (original)
+++ maven/continuum/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/utils/shell/DefaultShellCommandHelper.java Sun Jul 31 18:28:31 2005
@@ -21,7 +21,6 @@
import org.codehaus.plexus.util.cli.Commandline;
import org.codehaus.plexus.util.cli.StreamConsumer;
import org.codehaus.plexus.util.cli.WriterStreamConsumer;
-import org.codehaus.plexus.util.FileUtils;
import java.io.File;
import java.io.FileWriter;
Modified: maven/continuum/branches/trygvis-test/continuum-core/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-core/src/main/resources/META-INF/plexus/components.xml?rev=226714&r1=226713&r2=226714&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-core/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/continuum/branches/trygvis-test/continuum-core/src/main/resources/META-INF/plexus/components.xml Sun Jul 31 18:28:31 2005
@@ -509,6 +509,7 @@
| JDO
|
|-->
+<!--
<component>
<role>org.codehaus.plexus.jdo.JdoFactory</role>
<implementation>org.codehaus.plexus.jdo.DefaultJdoFactory</implementation>
@@ -518,62 +519,22 @@
<name>javax.jdo.PersistenceManagerFactoryClass</name>
<value>org.jpox.PersistenceManagerFactoryImpl</value>
</property>
- <!-- HSQL DB Configuration -->
<property>
<name>javax.jdo.option.ConnectionDriverName</name>
<value>org.hsqldb.jdbcDriver</value>
</property>
<property>
<name>javax.jdo.option.ConnectionURL</name>
- <value>jdbc:hsqldb:mem:foo</value>
+ <value>jdbc:hsqldb:faen</value>
</property>
<property>
<name>javax.jdo.option.ConnectionUserName</name>
<value>sa</value>
</property>
- <!--
- -->
- <!-- Postgresql Configuration -->
- <!--
- <property>
- <name>javax.jdo.option.ConnectionDriverName</name>
- <value>org.postgresql.Driver</value>
- </property>
- <property>
- <name>javax.jdo.option.ConnectionURL</name>
- <value>jdbc:postgresql://localhost/continuum</value>
- </property>
- <property>
- <name>javax.jdo.option.ConnectionUserName</name>
- <value>trygvis</value>
- </property>
- -->
- <!-- Apache Derby Configuration -->
- <!--
- <property>
- <name>javax.jdo.option.ConnectionDriverName</name>
- <value>org.apache.derby.jdbc.EmbeddedDriver</value>
- </property>
- <property>
- <name>javax.jdo.option.ConnectionURL</name>
- <value>jdbc:derby:faen;create=true</value>
- </property>
- <property>
- <name>javax.jdo.option.ConnectionUserName</name>
- <value>sa</value>
- </property>
- -->
<property>
<name>javax.jdo.option.ConnectionPassword</name>
<value></value>
</property>
- <!--
- | NOTE: This is the only value HSQLDB supports so we're hardcoding this value
- | here to prevent JPOX from complaining about the lack of support when running the
- | unit tests. When running with Continuum in a production enviroment
- | READ_COMMITTED should be used.
- |-->
-<!--
<property>
<name>org.jpox.transactionIsolation</name>
<value>READ_UNCOMMITTED</value>
@@ -582,23 +543,22 @@
<name>org.jpox.poid.transactionIsolation</name>
<value>READ_UNCOMMITTED</value>
</property>
--->
- <property>
- <name>org.jpox.autoCreateSchema</name>
- <value>true</value>
- </property>
<property>
<name>org.jpox.autoStartMechanism</name>
<value>SchemaTable</value>
</property>
<property>
+ <name>org.jpox.autoCreateSchema</name>
+ <value>true</value>
+ </property>
+ <property>
<name>org.jpox.autoStartMechanismMode</name>
<value>Quiet</value>
</property>
</properties>
</configuration>
</component>
-
+-->
<!--
|
| Velocity
Modified: maven/continuum/branches/trygvis-test/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumTest.java?rev=226714&r1=226713&r2=226714&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumTest.java (original)
+++ maven/continuum/branches/trygvis-test/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumTest.java Sun Jul 31 18:28:31 2005
@@ -16,17 +16,17 @@
* limitations under the License.
*/
-import org.apache.maven.continuum.project.MavenTwoProject;
import org.apache.maven.continuum.project.ContinuumProject;
+import org.apache.maven.continuum.project.MavenTwoProject;
import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult;
import org.codehaus.plexus.taskqueue.TaskQueue;
import org.codehaus.plexus.taskqueue.execution.TaskQueueExecutor;
-import java.util.List;
-import java.util.Map;
+import java.io.File;
import java.util.HashMap;
import java.util.Iterator;
-import java.io.File;
+import java.util.Map;
+import java.util.List;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
@@ -35,7 +35,6 @@
public class DefaultContinuumTest
extends AbstractContinuumTest
{
-/*
public void testContinuumConfiguration()
throws Exception
{
@@ -53,7 +52,7 @@
lookup( TaskQueueExecutor.ROLE, "check-out-project" );
}
-*/
+
public void testAddMavenTwoProjectSet()
throws Exception
{
@@ -97,7 +96,7 @@
assertTrue( "no jabber notifier", projects.containsKey( "Continuum Jabber Notifier" ) );
// TODO: assert that the project is the in the group
}
-/*
+
public void testUpdateMavenTwoProject()
throws Exception
{
@@ -131,5 +130,4 @@
assertNotNull( "The command line arguments are null.", project.getCommandLineArguments() );
}
-*/
}
Modified: maven/continuum/branches/trygvis-test/continuum-core/src/test/java/org/apache/maven/continuum/execution/manager/DefaultBuildExecutorManagerTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-core/src/test/java/org/apache/maven/continuum/execution/manager/DefaultBuildExecutorManagerTest.java?rev=226714&r1=226713&r2=226714&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-core/src/test/java/org/apache/maven/continuum/execution/manager/DefaultBuildExecutorManagerTest.java (original)
+++ maven/continuum/branches/trygvis-test/continuum-core/src/test/java/org/apache/maven/continuum/execution/manager/DefaultBuildExecutorManagerTest.java Sun Jul 31 18:28:31 2005
@@ -16,14 +16,14 @@
* limitations under the License.
*/
-import org.codehaus.plexus.PlexusTestCase;
+import org.apache.maven.continuum.AbstractContinuumTest;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @version $Id$
*/
public class DefaultBuildExecutorManagerTest
- extends PlexusTestCase
+ extends AbstractContinuumTest
{
public void testBasic()
throws Exception
Modified: maven/continuum/branches/trygvis-test/continuum-core/src/test/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutorTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-core/src/test/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutorTest.java?rev=226714&r1=226713&r2=226714&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-core/src/test/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutorTest.java (original)
+++ maven/continuum/branches/trygvis-test/continuum-core/src/test/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutorTest.java Sun Jul 31 18:28:31 2005
@@ -16,24 +16,23 @@
* limitations under the License.
*/
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-
+import org.apache.maven.continuum.AbstractContinuumTest;
import org.apache.maven.continuum.execution.manager.BuildExecutorManager;
import org.apache.maven.continuum.project.ContinuumNotifier;
import org.apache.maven.continuum.project.MavenOneProject;
-
-import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.util.FileUtils;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @version $Id$
*/
public class MavenOneBuildExecutorTest
- extends PlexusTestCase
+ extends AbstractContinuumTest
{
public void testUpdatingAProjectFromScmWithAExistingProjectAndAEmptyMaven1Pom()
throws Exception
Modified: maven/continuum/branches/trygvis-test/continuum-core/src/test/java/org/apache/maven/continuum/scm/ContinuumScmTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-core/src/test/java/org/apache/maven/continuum/scm/ContinuumScmTest.java?rev=226714&r1=226713&r2=226714&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-core/src/test/java/org/apache/maven/continuum/scm/ContinuumScmTest.java (original)
+++ maven/continuum/branches/trygvis-test/continuum-core/src/test/java/org/apache/maven/continuum/scm/ContinuumScmTest.java Sun Jul 31 18:28:31 2005
@@ -16,14 +16,14 @@
* limitations under the License.
*/
-import org.codehaus.plexus.PlexusTestCase;
+import org.apache.maven.continuum.AbstractContinuumTest;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @version $Id$
*/
public class ContinuumScmTest
- extends PlexusTestCase
+ extends AbstractContinuumTest
{
public void testBasic()
throws Exception
Modified: maven/continuum/branches/trygvis-test/continuum-core/src/test/java/org/apache/maven/continuum/store/AbstractContinuumStoreTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-core/src/test/java/org/apache/maven/continuum/store/AbstractContinuumStoreTest.java?rev=226714&r1=226713&r2=226714&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-core/src/test/java/org/apache/maven/continuum/store/AbstractContinuumStoreTest.java (original)
+++ maven/continuum/branches/trygvis-test/continuum-core/src/test/java/org/apache/maven/continuum/store/AbstractContinuumStoreTest.java Sun Jul 31 18:28:31 2005
@@ -765,15 +765,14 @@
s = store.addSchedule( s );
- project.addSchedule( s );
+ assertEquals( 1, store.getSchedules().size() );
- // update project
- store.updateProject( project );
+ assertEquals( 1, store.getAllProjects().size() );
- assertEquals( 1, store.getSchedules().size() );
+ project.addSchedule( s );
- // retrieve project
- project = store.getProject( projectId );
+ // update and retrieve project
+ project = store.updateProject( project );
assertNotNull( project );
Modified: maven/continuum/branches/trygvis-test/continuum-core/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-core/src/test/resources/log4j.properties?rev=226714&r1=226713&r2=226714&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-core/src/test/resources/log4j.properties (original)
+++ maven/continuum/branches/trygvis-test/continuum-core/src/test/resources/log4j.properties Sun Jul 31 18:28:31 2005
@@ -4,7 +4,11 @@
log4j.appender.root.layout.ConversionPattern=%d{HH:mm:ss,SSS} %-5p [%c] - %m%n
# JPOX Categories
-log4j.category.JPOX=ERROR, root
+log4j.category.JPOX=WARN, root
+log4j.category.JPOX.RDBMS=ERROR, root
+log4j.category.JPOX.RDBMS.Schema=WARN, root
+log4j.category.JPOX.RDBMS.DDL=DEBUG, root
+log4j.category.JPOX.RDBMS.SQL=WARN, root
#log4j.category.JPOX.JDO=DEBUG, root
#log4j.category.JPOX.Cache=DEBUG, root
Added: maven/continuum/branches/trygvis-test/continuum-model/create-schema.sh
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-model/create-schema.sh?rev=226714&view=auto
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-model/create-schema.sh (added)
+++ maven/continuum/branches/trygvis-test/continuum-model/create-schema.sh Sun Jul 31 18:28:31 2005
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+source db-settings
+
+java \
+ -Djavax.jdo.option.ConnectionDriverName=$driver \
+ -Djavax.jdo.option.ConnectionURL=$url \
+ -Djavax.jdo.option.ConnectionUserName=$user \
+ -Djavax.jdo.option.ConnectionPassword=$pass \
+ -cp $HOME/.m2/repository/log4j/log4j/1.2.8/log4j-1.2.8.jar:\
+$HOME/.m2/repository/jdo/jdo/2.0-beta/jdo-2.0-beta.jar:\
+$HOME/.m2/repository/jpox/jpox/1.1.0-beta-4-c1/jpox-1.1.0-beta-4-c1.jar:\
+$HOME/.m2/repository/jpox/jpox-enhancer/1.1.0-beta-4-c1/jpox-enhancer-1.1.0-beta-4-c1.jar:\
+$HOME/.m2/repository/hsqldb/hsqldb/1.7.3.3/hsqldb-1.7.3.3.jar:\
+$HOME/.m2/repository/org/apache/incubator/derby/derby/10.0.2.1/derby-10.0.2.1.jar:\
+src/main/resources/:\
+target/classes \
+ org.jpox.SchemaTool \
+ -create \
+ src/main/resources/META-INF/package.jdo
Propchange: maven/continuum/branches/trygvis-test/continuum-model/create-schema.sh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/continuum/branches/trygvis-test/continuum-model/create-schema.sh
------------------------------------------------------------------------------
svn:executable = *
Added: maven/continuum/branches/trygvis-test/continuum-model/db-settings
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-model/db-settings?rev=226714&view=auto
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-model/db-settings (added)
+++ maven/continuum/branches/trygvis-test/continuum-model/db-settings Sun Jul 31 18:28:31 2005
@@ -0,0 +1,16 @@
+#hsqldb
+driver=org.hsqldb.jdbcDriver
+url=jdbc:hsqldb:database
+
+#embedded derby
+driver="org.apache.derby.jdbc.EmbeddedDriver"
+url="jdbc:derby:database;create=true"
+
+# remote derby
+#driver="com.ibm.db2.jcc.DB2Driver"
+#url="jdbc:derby://localhost;create=true"
+
+user="sa"
+password=""
+
+cp log4j.properties src/main/resources
Modified: maven/continuum/branches/trygvis-test/continuum-model/dump-ddl.sh
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-model/dump-ddl.sh?rev=226714&r1=226713&r2=226714&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-model/dump-ddl.sh (original)
+++ maven/continuum/branches/trygvis-test/continuum-model/dump-ddl.sh Sun Jul 31 18:28:31 2005
@@ -1,20 +1,20 @@
#!/bin/bash
-#hsqldb
-CONNECTION="-Djavax.jdo.option.ConnectionDriverName=org.hsqldb.jdbcDriver -Djavax.jdo.option.ConnectionURL=jdbc:hsqldb:database"
-
-#derby
-CONNECTION="-Djavax.jdo.option.ConnectionDriverName=org.apache.derby.jdbc.EmbeddedDriver -Djavax.jdo.option.ConnectionURL=jdbc:derby:database;create=true"
+source db-settings
java \
- $CONNECTION \
+ -Djavax.jdo.option.ConnectionDriverName=$driver \
+ -Djavax.jdo.option.ConnectionURL=$url \
+ -Djavax.jdo.option.ConnectionUserName=$user \
+ -Djavax.jdo.option.ConnectionPassword=$pass \
-cp $HOME/.m2/repository/log4j/log4j/1.2.8/log4j-1.2.8.jar:\
$HOME/.m2/repository/jdo/jdo/2.0-beta/jdo-2.0-beta.jar:\
$HOME/.m2/repository/jpox/jpox/1.1.0-beta-4-c1/jpox-1.1.0-beta-4-c1.jar:\
$HOME/.m2/repository/jpox/jpox-enhancer/1.1.0-beta-4-c1/jpox-enhancer-1.1.0-beta-4-c1.jar:\
$HOME/.m2/repository/hsqldb/hsqldb/1.7.3.3/hsqldb-1.7.3.3.jar:\
$HOME/.m2/repository/org/apache/incubator/derby/derby/10.0.2.1/derby-10.0.2.1.jar:\
+src/main/resources/:\
target/classes \
org.jpox.SchemaTool \
- -dumpDdl ddl.txt \
- target/classes/META-INF/package.jdo
+ -create -dumpDdl ddl.txt \
+ src/main/resources/META-INF/package.jdo
Added: maven/continuum/branches/trygvis-test/continuum-model/run-derby.sh
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-model/run-derby.sh?rev=226714&view=auto
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-model/run-derby.sh (added)
+++ maven/continuum/branches/trygvis-test/continuum-model/run-derby.sh Sun Jul 31 18:28:31 2005
@@ -0,0 +1,8 @@
+CP=
+CP=$CP:$HOME/.m2/repository/org/apache/incubator/derby/derby/10.0.2.1/derby-10.0.2.1.jar
+CP=$CP:$HOME/.m2/repository/org/apache/incubator/derby/derbynet/10.0.2.1/derbynet-10.0.2.1.jar
+
+mkdir -p target/derby
+java -cp $CP \
+ -Dderby.system.home=target/derby \
+ org.apache.derby.drda.NetworkServerControl start
Propchange: maven/continuum/branches/trygvis-test/continuum-model/run-derby.sh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/continuum/branches/trygvis-test/continuum-model/run-derby.sh
------------------------------------------------------------------------------
svn:executable = *
Modified: maven/continuum/branches/trygvis-test/continuum-model/src/main/resources/META-INF/package.jdo
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-model/src/main/resources/META-INF/package.jdo?rev=226714&r1=226713&r2=226714&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-model/src/main/resources/META-INF/package.jdo (original)
+++ maven/continuum/branches/trygvis-test/continuum-model/src/main/resources/META-INF/package.jdo Sun Jul 31 18:28:31 2005
@@ -6,16 +6,9 @@
<jdo>
<package name="org.apache.maven.continuum.project">
- <class name="ContinuumProject" detachable="true" identity-type="application">
-<!--
+ <class name="ContinuumProject" detachable="true" identity-type="application" objectid-class="javax.jdo.identity.StringIdentity" table="project">
<inheritance strategy="new-table">
<discriminator strategy="class-name">
- <column name="DISCRIMINATOR" jdbc-type="VARCHAR" length="128"/>
- </discriminator>
- </inheritance>
--->
- <inheritance strategy="superclass-table">
- <discriminator strategy="class-name">
<column name="PROJECT_TYPE"/>
</discriminator>
</inheritance>
@@ -30,12 +23,8 @@
<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="checkOutErrorMessage" persistence-modifier="persistent">
- <column jdbc-type="CLOB"/>
- </field>
- <field name="checkOutErrorException" persistence-modifier="persistent">
- <column jdbc-type="CLOB"/>
- </field>
+ <field name="checkOutErrorMessage" persistence-modifier="persistent"/>
+ <field name="checkOutErrorException" persistence-modifier="persistent"/>
<field name="mailType" persistence-modifier="persistent"/>
<field name="commandLineArguments" persistence-modifier="persistent"/>
<field name="url" persistence-modifier="persistent"/>
@@ -56,12 +45,12 @@
<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">
+ <field name="schedules" persistence-modifier="persistent" table="project_schedules">
<collection element-type="ContinuumSchedule"/>
<join/>
</field>
- <field name="buildGroups" persistence-modifier="persistent">
+ <field name="buildGroups" persistence-modifier="persistent" table="project_build_groups">
<collection element-type="ContinuumBuildGroup"/>
<join/>
</field>
@@ -80,7 +69,7 @@
</fetch-group>
</class>
- <class name="ContinuumSchedule" detachable="true" identity-type="application">
+ <class name="ContinuumSchedule" detachable="true" identity-type="application" objectid-class="javax.jdo.identity.StringIdentity" table="schedule">
<field name="projects" persistence-modifier="persistent" mapped-by="schedules">
<collection element-type="ContinuumProject"/>
</field>
@@ -96,49 +85,49 @@
</fetch-group>
</class>
- <class name="ContinuumNotifier" detachable="true" identity-type="datastore">
+ <class name="ContinuumNotifier" detachable="true" identity-type="datastore" table="notifier">
<field name="type" persistence-modifier="persistent"/>
- <field name="configuration" persistence-modifier="persistent" default-fetch-group="true">
- <map key-type="java.lang.String" value-type="String" dependent-key="true" dependent-value="true"/>
+ <field name="configuration" persistence-modifier="persistent" default-fetch-group="true" table="notifier_configuration">
+ <map key-type="java.lang.String" value-type="java.lang.String" dependent-key="true" dependent-value="true"/>
<join/>
</field>
</class>
- <class name="ContinuumDeveloper" detachable="true" identity-type="application">
+ <class name="ContinuumDeveloper" detachable="true" identity-type="application" objectid-class="javax.jdo.identity.StringIdentity" table="developer">
<field name="id" persistence-modifier="persistent" primary-key="true" value-strategy="native"/>
<field name="name" persistence-modifier="persistent"/>
<field name="email" persistence-modifier="persistent"/>
</class>
- <class name="ContinuumDependency" detachable="true" identity-type="datastore">
+ <class name="ContinuumDependency" detachable="true" identity-type="datastore" table="dependency">
<field name="groupId" persistence-modifier="persistent"/>
<field name="artifactId" persistence-modifier="persistent"/>
<field name="version" persistence-modifier="persistent"/>
</class>
<class name="MavenTwoProject" persistence-capable-superclass="org.apache.maven.continuum.project.ContinuumProject" detachable="true">
- <!-- <inheritance strategy="superclass-table"/> -->
+ <inheritance strategy="superclass-table"/>
<field name="goals" persistence-modifier="persistent">
<column name="M2_GOALS"/>
</field>
</class>
<class name="MavenOneProject" persistence-capable-superclass="org.apache.maven.continuum.project.ContinuumProject" detachable="true">
- <!-- <inheritance strategy="superclass-table"/> -->
+ <inheritance strategy="superclass-table"/>
<field name="goals" persistence-modifier="persistent">
<column name="M1_GOALS"/>
</field>
</class>
<class name="AntProject" persistence-capable-superclass="org.apache.maven.continuum.project.ContinuumProject" detachable="true">
- <!-- <inheritance strategy="superclass-table"/> -->
+ <inheritance strategy="superclass-table"/>
<field name="executable" persistence-modifier="persistent">
<column name="ANT_EXECUTABLE"/>
</field>
<field name="targets" persistence-modifier="persistent"/>
</class>
<class name="ShellProject" persistence-capable-superclass="org.apache.maven.continuum.project.ContinuumProject" detachable="true">
- <!-- <inheritance strategy="superclass-table"/> -->
+ <inheritance strategy="superclass-table"/>
<field name="executable" persistence-modifier="persistent">
<column name="SHELL_EXECUTABLE"/>
</field>
</class>
- <class name="ContinuumBuild" detachable="true" identity-type="application">
+ <class name="ContinuumBuild" detachable="true" identity-type="application" objectid-class="javax.jdo.identity.StringIdentity" table="build">
<field name="project" persistence-modifier="persistent" null-value="exception" default-fetch-group="false"/>
<field name="id" persistence-modifier="persistent" primary-key="true" value-strategy="native"/>
<field name="state" persistence-modifier="persistent"/>
@@ -155,14 +144,14 @@
<!-- New Object Model -->
- <class name="ContinuumBuildGroup" detachable="true" identity-type="application">
+ <class name="ContinuumBuildGroup" detachable="true" identity-type="application" objectid-class="javax.jdo.identity.StringIdentity" table="build_group">
<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">
+ <field name="buildSettings" persistence-modifier="persistent" table="build_group_settings">
<collection element-type="ContinuumBuildSettings"/>
<join/>
</field>
@@ -172,7 +161,7 @@
</fetch-group>
</class>
- <class name="ContinuumProjectGroup" detachable="true" identity-type="application">
+ <class name="ContinuumProjectGroup" detachable="true" identity-type="application" objectid-class="javax.jdo.identity.StringIdentity" table="project_group">
<field name="id" persistence-modifier="persistent" primary-key="true" value-strategy="native"/>
<field name="groupId" persistence-modifier="persistent"/>
<field name="name" persistence-modifier="persistent"/>
@@ -184,7 +173,7 @@
<field name="projects" persistence-modifier="persistent" mapped-by="projectGroup">
<collection element-type="ContinuumProject"/>
</field>
- <field name="buildSettings" persistence-modifier="persistent">
+ <field name="buildSettings" persistence-modifier="persistent" table="pg_build_settings">
<collection element-type="ContinuumBuildSettings"/>
<join/>
</field>
@@ -194,7 +183,7 @@
</fetch-group>
</class>
- <class name="ContinuumBuildSettings" detachable="true" identity-type="application">
+ <class name="ContinuumBuildSettings" detachable="true" identity-type="application" objectid-class="javax.jdo.identity.StringIdentity" table="build_settings">
<field name="id" persistence-modifier="persistent" primary-key="true" value-strategy="native"/>
<field name="name" persistence-modifier="persistent"/>
<field name="notificationScheme" persistence-modifier="persistent"/>
@@ -216,7 +205,7 @@
</package>
<package name="org.apache.maven.continuum.scm">
- <class name="ScmResult" detachable="true" identity-type="datastore">
+ <class name="ScmResult" detachable="true" identity-type="datastore" table="scm_result">
<field name="success" persistence-modifier="persistent"/>
<field name="providerMessage" persistence-modifier="persistent">
</field>
@@ -229,16 +218,16 @@
<collection element-type="ChangeSet" dependent-element="true"/>
</field>
</class>
- <class name="ScmFile" detachable="true" identity-type="datastore">
+ <class name="ScmFile" detachable="true" identity-type="datastore" table="scm_file">
<field name="path" persistence-modifier="persistent"/>
</class>
- <class name="ChangeSet" detachable="true" identity-type="datastore">
+ <class name="ChangeSet" detachable="true" identity-type="datastore" table="change_set">
<field name="author" persistence-modifier="persistent"/>
<field name="comment" persistence-modifier="persistent"/>
<field name="date" persistence-modifier="persistent"/>
<field name="file" persistence-modifier="persistent" default-fetch-group="true" dependent="true"/>
</class>
- <class name="ChangeFile" detachable="true" identity-type="datastore">
+ <class name="ChangeFile" detachable="true" identity-type="datastore" table="change_file">
<field name="name" persistence-modifier="persistent"/>
<field name="revision" persistence-modifier="persistent"/>
</class>
@@ -247,10 +236,10 @@
<!-- Profiles -->
<package name="org.apache.maven.continuum.profile">
- <class name="ContinuumProfile" detachable="true" identity-type="datastore">
+ <class name="ContinuumProfile" detachable="true" identity-type="datastore" table="profile">
<field name="jdk" persistence-modifier="persistent"/>
</class>
- <class name="ContinuumJdk" detachable="true" identity-type="datastore">
+ <class name="ContinuumJdk" detachable="true" identity-type="datastore" table="jdk">
<field name="version" persistence-modifier="persistent"/>
<field name="home" persistence-modifier="persistent"/>
</class>
Modified: maven/continuum/branches/trygvis-test/continuum-plexus-application/plexus-jamvm.sh
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-plexus-application/plexus-jamvm.sh?rev=226714&r1=226713&r2=226714&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-plexus-application/plexus-jamvm.sh (original)
+++ maven/continuum/branches/trygvis-test/continuum-plexus-application/plexus-jamvm.sh Sun Jul 31 18:28:31 2005
@@ -5,14 +5,14 @@
PWD=`pwd`
GNU_CLASSPATH=$HOME/opt/classpath-HEAD/share/classpath/glibj.zip
-JAVA=$HOME/opt/jamvm-1.3.0/bin/jamvm
+JAVA=$HOME/opt/jamvm-1.3.2/bin/jamvm
# -Xbootclasspath:$GNU_CLASSPATH \
# -verbose:{class,gc,jni} \
$JAVA \
-Xnoasyncgc \
- -classpath $PWD/target/plexus-test-runtime/core/boot/classworlds-1.1-alpha-1.jar \
+ -classpath $PWD/target/plexus-test-runtime/core/boot/classworlds-1.1-alpha-2.jar \
-Dclassworlds.conf=$PWD/target/plexus-test-runtime/conf/classworlds.conf \
-Dplexus.core=$PWD/target/plexus-test-runtime/core \
-Djava.io.tmpdir=$PWD/target/plexus-test-runtime/temp \
Modified: maven/continuum/branches/trygvis-test/continuum-plexus-application/plexus-kaffe.sh
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-plexus-application/plexus-kaffe.sh?rev=226714&r1=226713&r2=226714&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-plexus-application/plexus-kaffe.sh (original)
+++ maven/continuum/branches/trygvis-test/continuum-plexus-application/plexus-kaffe.sh Sun Jul 31 18:28:31 2005
@@ -8,13 +8,14 @@
#JAVA="$JAVA -verbose"
JAVA=kaffe
JAVA=$HOME/opt/kaffe/bin/kaffe
+JAVA=$HOME/opt/Linux-i686/kaffe-cvs/bin/kaffe
# -fullversion \
# -Xbootclasspath/p:$HOME/opt/classpath-HEAD/share/classpath/glibj.zip \
# -verbose \
$JAVA \
-Xmx128m \
- -classpath $PWD/target/plexus-test-runtime/core/boot/classworlds-1.1-alpha-1.jar \
+ -classpath $PWD/target/plexus-test-runtime/core/boot/classworlds-1.1-alpha-2.jar \
-Dclassworlds.conf=$PWD/target/plexus-test-runtime/conf/classworlds.conf \
-Dplexus.core=$PWD/target/plexus-test-runtime/core \
-Djava.io.tmpdir=$PWD/target/plexus-test-runtime/temp \
Modified: maven/continuum/branches/trygvis-test/continuum-plexus-application/plexus-sablevm.sh
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-plexus-application/plexus-sablevm.sh?rev=226714&r1=226713&r2=226714&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-plexus-application/plexus-sablevm.sh (original)
+++ maven/continuum/branches/trygvis-test/continuum-plexus-application/plexus-sablevm.sh Sun Jul 31 18:28:31 2005
@@ -8,7 +8,6 @@
JAVA=$HOME/opt/sablevm-trunk/bin/sablevm
$JAVA \
- -Xbootclasspath $GNU_CLASSPATH \
-classpath $PWD/target/plexus-test-runtime/core/boot/classworlds-1.1-alpha-1.jar \
-Dclassworlds.conf=$PWD/target/plexus-test-runtime/conf/classworlds.conf \
-Dplexus.core=$PWD/target/plexus-test-runtime/core \
Modified: maven/continuum/branches/trygvis-test/continuum-plexus-application/src/conf/application.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-plexus-application/src/conf/application.xml?rev=226714&r1=226713&r2=226714&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-plexus-application/src/conf/application.xml (original)
+++ maven/continuum/branches/trygvis-test/continuum-plexus-application/src/conf/application.xml Sun Jul 31 18:28:31 2005
@@ -308,19 +308,36 @@
<name>javax.jdo.PersistenceManagerFactoryClass</name>
<value>org.jpox.PersistenceManagerFactoryImpl</value>
</property>
+<!--
<property>
<name>org.jpox.autoCreateSchema</name>
<value>true</value>
</property>
<property>
+ <name>org.jpox.autoCreateColumns</name>
+ <value>true</value>
+ </property>
+ <property>
<name>org.jpox.autoStartMechanism</name>
<value>SchemaTable</value>
</property>
<property>
<name>org.jpox.autoStartMechanismMode</name>
- <value>Quiet</value>
+ <value>Ignored</value>
+ </property>
+-->
+ <property>
+ <name>org.jpox.validateTables</name>
+ <value>false</value>
+ </property>
+ <property>
+ <name>org.jpox.validateColumns</name>
+ <value>false</value>
+ </property>
+ <property>
+ <name>org.jpox.validateConstraints</name>
+ <value>false</value>
</property>
-
<!-- Apache Derby Configuration -->
<property>
<name>javax.jdo.option.ConnectionDriverName</name>
@@ -328,7 +345,7 @@
</property>
<property>
<name>javax.jdo.option.ConnectionURL</name>
- <value>jdbc:derby:${plexus.home}/database;create=true</value>
+ <value>jdbc:derby:${plexus.home}/database</value>
</property>
<property>
<name>javax.jdo.option.ConnectionUserName</name>
@@ -391,10 +408,6 @@
<name>org.jpox.poid.transactionIsolation</name>
<value>READ_COMMITTED</value>
</property>
- <property>
- <name>javax.jdo.option.ConnectionPassword</name>
- <value></value>
- </property>
</properties>
</configuration>
</component>
@@ -529,7 +542,11 @@
</level>
<level>
<hierarchy>JPOX</hierarchy>
- <level>ERROR</level>
+ <level>INFO</level>
+ </level>
+ <level>
+ <hierarchy>JPOX.Cache</hierarchy>
+ <level>WARN</level>
</level>
</levels>
</configuration>
Modified: maven/continuum/branches/trygvis-test/continuum-test/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-test/pom.xml?rev=226714&r1=226713&r2=226714&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-test/pom.xml (original)
+++ maven/continuum/branches/trygvis-test/continuum-test/pom.xml Sun Jul 31 18:28:31 2005
@@ -13,5 +13,9 @@
<groupId>org.apache.maven.continuum</groupId>
<artifactId>continuum-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>plexus</groupId>
+ <artifactId>plexus-jdo2</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: maven/continuum/branches/trygvis-test/continuum-test/src/main/java/org/apache/maven/continuum/AbstractContinuumTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-test/src/main/java/org/apache/maven/continuum/AbstractContinuumTest.java?rev=226714&r1=226713&r2=226714&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-test/src/main/java/org/apache/maven/continuum/AbstractContinuumTest.java (original)
+++ maven/continuum/branches/trygvis-test/continuum-test/src/main/java/org/apache/maven/continuum/AbstractContinuumTest.java Sun Jul 31 18:28:31 2005
@@ -34,13 +34,21 @@
import org.apache.maven.continuum.store.ContinuumStoreException;
import org.apache.maven.continuum.utils.ContinuumUtils;
import org.codehaus.plexus.PlexusTestCase;
+import org.codehaus.plexus.jdo.JdoFactory;
+import org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory;
+import org.codehaus.plexus.jdo.ConfigurableJdoFactory;
import org.codehaus.plexus.util.FileUtils;
+import org.jpox.SchemaTool;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Properties;
+import java.util.Iterator;
+import java.util.Map;
import javax.jdo.JDOHelper;
+import javax.jdo.PersistenceManagerFactory;
+import javax.jdo.PersistenceManager;
import java.io.IOException;
/**
@@ -56,6 +64,8 @@
*/
private static ContinuumProjectGroup defaultProjectGroup;
+ private ContinuumStore store;
+
// ----------------------------------------------------------------------
//
// ----------------------------------------------------------------------
@@ -66,6 +76,8 @@
super.setUp();
setUpConfigurationService( (ConfigurationService) lookup( ConfigurationService.ROLE ) );
+
+ getStore();
}
public static void setUpConfigurationService( ConfigurationService configurationService )
@@ -105,7 +117,75 @@
protected ContinuumStore getStore()
throws Exception
{
- return (ContinuumStore) lookup( ContinuumStore.ROLE );
+ if ( store != null )
+ {
+ return store;
+ }
+
+ // ----------------------------------------------------------------------
+ // Set up the JDO factory
+ // ----------------------------------------------------------------------
+
+ Object o = lookup( JdoFactory.ROLE );
+
+ assertEquals( DefaultConfigurableJdoFactory.class.getName(), o.getClass().getName() );
+
+ ConfigurableJdoFactory jdoFactory = (ConfigurableJdoFactory) o;
+
+ jdoFactory.setPersistenceManagerFactoryClass( "org.jpox.PersistenceManagerFactoryImpl" );
+
+ jdoFactory.setDriverName( "org.hsqldb.jdbcDriver" );
+
+ jdoFactory.setUrl( "jdbc:hsqldb:mem:foo" );
+
+ jdoFactory.setUserName( "sa" );
+
+ jdoFactory.setPassword( "" );
+
+ jdoFactory.setProperty( "org.jpox.transactionIsolation", "READ_UNCOMMITTED" );
+
+ jdoFactory.setProperty( "org.jpox.poid.transactionIsolation", "READ_UNCOMMITTED" );
+
+ // ----------------------------------------------------------------------
+ // Create the tables
+ // ----------------------------------------------------------------------
+
+ Properties properties = jdoFactory.getProperties();
+
+ for ( Iterator it = properties.entrySet().iterator(); it.hasNext(); )
+ {
+ Map.Entry entry = (Map.Entry) it.next();
+
+ System.setProperty( (String) entry.getKey(), (String) entry.getValue() );
+ }
+
+ String[] files = new String[]{
+ getTestPath( "../continuum-model/src/main/resources/META-INF/package.jdo" ),
+ };
+
+ boolean verbose = false;
+
+ SchemaTool.createSchemaTables( files, verbose );
+
+ // ----------------------------------------------------------------------
+ // Check the configuration
+ // ----------------------------------------------------------------------
+
+ PersistenceManagerFactory pmf = jdoFactory.getPersistenceManagerFactory();
+
+ assertNotNull( pmf );
+
+ PersistenceManager pm = pmf.getPersistenceManager();
+
+ pm.close();
+
+ // ----------------------------------------------------------------------
+ //
+ // ----------------------------------------------------------------------
+
+ store = (ContinuumStore) lookup( ContinuumStore.ROLE );
+
+ return store;
}
// ----------------------------------------------------------------------
@@ -321,7 +401,7 @@
project.setCheckOutErrorMessage( errorMessage );
- project.setCheckOutErrorException( ContinuumUtils.throwableToString( exception ) );
+ project.setCheckOutErrorException( ContinuumUtils.throwableMessagesToString( exception ) );
return store.updateProject( project );
}
Added: maven/continuum/branches/trygvis-test/continuum-test/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-test/src/main/resources/META-INF/plexus/components.xml?rev=226714&view=auto
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-test/src/main/resources/META-INF/plexus/components.xml (added)
+++ maven/continuum/branches/trygvis-test/continuum-test/src/main/resources/META-INF/plexus/components.xml Sun Jul 31 18:28:31 2005
@@ -0,0 +1,8 @@
+<component-set>
+ <components>
+ <component>
+ <role>org.codehaus.plexus.jdo.JdoFactory</role>
+ <implementation>org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory</implementation>
+ </component>
+ </components>
+</component-set>
Propchange: maven/continuum/branches/trygvis-test/continuum-test/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/continuum/branches/trygvis-test/continuum-test/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
svn:keywords = Id
Modified: maven/continuum/branches/trygvis-test/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/pom.xml?rev=226714&r1=226713&r2=226714&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/pom.xml (original)
+++ maven/continuum/branches/trygvis-test/pom.xml Sun Jul 31 18:28:31 2005
@@ -136,17 +136,17 @@
<dependency>
<groupId>jdo</groupId>
<artifactId>jdo</artifactId>
- <version>2.0-beta</version>
+ <version>2.0-beta-20050728.014228</version>
</dependency>
<dependency>
<groupId>jpox</groupId>
<artifactId>jpox</artifactId>
- <version>1.1.0-beta-4-c1</version>
+ <version>1.1.0-beta-4-20050728.014228</version>
</dependency>
<dependency>
<groupId>jpox</groupId>
<artifactId>jpox-enhancer</artifactId>
- <version>1.1.0-beta-4-c1</version>
+ <version>1.1.0-beta-4-20050728.014228</version>
</dependency>
<!--
|
@@ -157,6 +157,11 @@
<groupId>plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>1.0.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>plexus</groupId>
+ <artifactId>plexus-jdo2</artifactId>
+ <version>1.0-alpha-2-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>