Author: jmcconnell
Date: Fri Apr 13 08:44:20 2007
New Revision: 528529
URL: http://svn.apache.org/viewvc?view=rev&rev=528529
Log:
commiting latest bits on the scheduler parts
Modified:
maven/archiva/branches/archiva-jpox-database-refactor/archiva-scheduled/pom.xml
maven/archiva/branches/archiva-jpox-database-refactor/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaScheduledTaskExecutor.java
maven/archiva/branches/archiva-jpox-database-refactor/archiva-scheduled/src/main/resources/META-INF/plexus/components.xml
maven/archiva/branches/archiva-jpox-database-refactor/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaScheduledTaskExecutorTest.java
Modified:
maven/archiva/branches/archiva-jpox-database-refactor/archiva-scheduled/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/branches/archiva-jpox-database-refactor/archiva-scheduled/pom.xml?view=diff&rev=528529&r1=528528&r2=528529
==============================================================================
---
maven/archiva/branches/archiva-jpox-database-refactor/archiva-scheduled/pom.xml
(original)
+++
maven/archiva/branches/archiva-jpox-database-refactor/archiva-scheduled/pom.xml
Fri Apr 13 08:44:20 2007
@@ -22,7 +22,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<parent>
<groupId>org.apache.maven.archiva</groupId>
- <artifactId>archiva-base</artifactId>
+ <artifactId>archiva-parent</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified:
maven/archiva/branches/archiva-jpox-database-refactor/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaScheduledTaskExecutor.java
URL:
http://svn.apache.org/viewvc/maven/archiva/branches/archiva-jpox-database-refactor/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaScheduledTaskExecutor.java?view=diff&rev=528529&r1=528528&r2=528529
==============================================================================
---
maven/archiva/branches/archiva-jpox-database-refactor/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaScheduledTaskExecutor.java
(original)
+++
maven/archiva/branches/archiva-jpox-database-refactor/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaScheduledTaskExecutor.java
Fri Apr 13 08:44:20 2007
@@ -180,6 +180,7 @@
if ( availableConsumers.containsKey( availableConsumers.get(
consumer ) ) )
{
+ getLogger().warn( "Using consumer " + consumer );
activeConsumers.add( availableConsumers.get( consumer ) );
}
else
Modified:
maven/archiva/branches/archiva-jpox-database-refactor/archiva-scheduled/src/main/resources/META-INF/plexus/components.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/branches/archiva-jpox-database-refactor/archiva-scheduled/src/main/resources/META-INF/plexus/components.xml?view=diff&rev=528529&r1=528528&r2=528529
==============================================================================
---
maven/archiva/branches/archiva-jpox-database-refactor/archiva-scheduled/src/main/resources/META-INF/plexus/components.xml
(original)
+++
maven/archiva/branches/archiva-jpox-database-refactor/archiva-scheduled/src/main/resources/META-INF/plexus/components.xml
Fri Apr 13 08:44:20 2007
@@ -1,3 +1,23 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you 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.
+ -->
+
<components>
<component>
<role>org.codehaus.plexus.taskqueue.TaskQueue</role>
Modified:
maven/archiva/branches/archiva-jpox-database-refactor/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaScheduledTaskExecutorTest.java
URL:
http://svn.apache.org/viewvc/maven/archiva/branches/archiva-jpox-database-refactor/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaScheduledTaskExecutorTest.java?view=diff&rev=528529&r1=528528&r2=528529
==============================================================================
---
maven/archiva/branches/archiva-jpox-database-refactor/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaScheduledTaskExecutorTest.java
(original)
+++
maven/archiva/branches/archiva-jpox-database-refactor/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaScheduledTaskExecutorTest.java
Fri Apr 13 08:44:20 2007
@@ -19,21 +19,6 @@
* under the License.
*/
-import org.apache.commons.io.FileUtils;
-import org.apache.maven.archiva.configuration.ArchivaConfiguration;
-import org.apache.maven.archiva.configuration.Configuration;
-import org.apache.maven.archiva.database.ArchivaDAO;
-import org.apache.maven.archiva.database.ArchivaDatabaseException;
-import org.apache.maven.archiva.database.RepositoryDAO;
-import org.apache.maven.archiva.model.ArchivaRepository;
-import org.apache.maven.archiva.scheduled.tasks.RepositoryTask;
-import org.codehaus.plexus.PlexusTestCase;
-import org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory;
-import org.codehaus.plexus.jdo.JdoFactory;
-import org.codehaus.plexus.taskqueue.execution.TaskExecutionException;
-import org.codehaus.plexus.taskqueue.execution.TaskExecutor;
-import org.jpox.SchemaTool;
-
import java.io.File;
import java.net.URL;
import java.util.Iterator;
@@ -44,6 +29,17 @@
import javax.jdo.PersistenceManager;
import javax.jdo.PersistenceManagerFactory;
+import org.apache.commons.lang.StringUtils;
+import org.apache.maven.archiva.database.ArchivaDAO;
+import org.apache.maven.archiva.database.RepositoryDAO;
+import org.apache.maven.archiva.model.ArchivaRepository;
+import org.apache.maven.archiva.scheduled.tasks.RepositoryTask;
+import org.codehaus.plexus.PlexusTestCase;
+import org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory;
+import org.codehaus.plexus.jdo.JdoFactory;
+import org.codehaus.plexus.taskqueue.execution.TaskExecutor;
+import org.jpox.SchemaTool;
+
/**
* IndexerTaskExecutorTest
*
@@ -61,6 +57,7 @@
throws Exception
{
super.setUp();
+
DefaultConfigurableJdoFactory jdoFactory =
(DefaultConfigurableJdoFactory) lookup( JdoFactory.ROLE, "archiva" );
assertEquals( DefaultConfigurableJdoFactory.class.getName(),
jdoFactory.getClass().getName() );
@@ -142,9 +139,16 @@
{
RepositoryDAO repoDao = dao.getRepositoryDAO();
+ File repoDir = new File( getBasedir(),
"src/test/repositories/default-repository" );
+
+ assertTrue( "Default Test Repository should exist.", repoDir.exists()
&& repoDir.isDirectory() );
+
+ String repoUri = "file://" + StringUtils.replace(
repoDir.getAbsolutePath(), "\\", "/" );
+
+
// Create it
ArchivaRepository repo =
- repoDao.createRepository( "testRepo", "Test Repository",
"http://localhost:8080/repository/foo"; );
+ repoDao.createRepository( "testRepo", "Test Repository", repoUri );
assertNotNull( repo );
// Set some mandatory values
