You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2011/09/13 14:12:52 UTC
svn commit: r1170135 [5/9] - in /archiva/trunk: ./
archiva-cli/src/main/java/org/apache/maven/archiva/cli/
archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/
archiva-modules/archiva-base/archiva-configuration/src...
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/InvalidScanConsumer.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/InvalidScanConsumer.java?rev=1170135&r1=1170134&r2=1170135&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/InvalidScanConsumer.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/InvalidScanConsumer.java Tue Sep 13 12:12:39 2011
@@ -19,14 +19,14 @@ package org.apache.archiva.repository.sc
* under the License.
*/
-import java.util.Date;
-import java.util.List;
-
-import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
+import org.apache.archiva.admin.model.managed.ManagedRepository;
import org.apache.maven.archiva.consumers.AbstractMonitoredConsumer;
import org.apache.maven.archiva.consumers.ConsumerException;
import org.apache.maven.archiva.consumers.InvalidRepositoryContentConsumer;
+import java.util.Date;
+import java.util.List;
+
/**
* InvalidScanConsumer
*
@@ -43,13 +43,13 @@ public class InvalidScanConsumer
private int processCount = 0;
- public void beginScan( ManagedRepositoryConfiguration repository, Date whenGathered )
+ public void beginScan( ManagedRepository repository, Date whenGathered )
throws ConsumerException
{
/* do nothing */
}
- public void beginScan( ManagedRepositoryConfiguration repository, Date whenGathered, boolean executeOnEntireRepo )
+ public void beginScan( ManagedRepository repository, Date whenGathered, boolean executeOnEntireRepo )
throws ConsumerException
{
beginScan( repository, whenGathered );
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/KnownScanConsumer.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/KnownScanConsumer.java?rev=1170135&r1=1170134&r2=1170135&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/KnownScanConsumer.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/KnownScanConsumer.java Tue Sep 13 12:12:39 2011
@@ -19,16 +19,16 @@ package org.apache.archiva.repository.sc
* under the License.
*/
+import org.apache.archiva.admin.model.managed.ManagedRepository;
+import org.apache.maven.archiva.consumers.AbstractMonitoredConsumer;
+import org.apache.maven.archiva.consumers.ConsumerException;
+import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
-import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
-import org.apache.maven.archiva.consumers.AbstractMonitoredConsumer;
-import org.apache.maven.archiva.consumers.ConsumerException;
-import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer;
-
/**
* ScanConsumer
*
@@ -70,13 +70,13 @@ public class KnownScanConsumer
return "Scan Consumer (for testing)";
}
- public void beginScan( ManagedRepositoryConfiguration repository, Date whenGathered )
+ public void beginScan( ManagedRepository repository, Date whenGathered )
throws ConsumerException
{
/* do nothing */
}
- public void beginScan( ManagedRepositoryConfiguration repository, Date whenGathered, boolean executeOnEntireRepo )
+ public void beginScan( ManagedRepository repository, Date whenGathered, boolean executeOnEntireRepo )
throws ConsumerException
{
beginScan( repository, whenGathered );
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryContentConsumersStub.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryContentConsumersStub.java?rev=1170135&r1=1170134&r2=1170135&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryContentConsumersStub.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryContentConsumersStub.java Tue Sep 13 12:12:39 2011
@@ -19,16 +19,16 @@ package org.apache.archiva.repository.sc
* under the License.
*/
-import java.util.Date;
+import org.apache.archiva.admin.model.admin.ArchivaAdministration;
-import org.apache.maven.archiva.configuration.ArchivaConfiguration;
+import java.util.Date;
public class RepositoryContentConsumersStub
extends RepositoryContentConsumers
{
- public RepositoryContentConsumersStub(ArchivaConfiguration archivaConfiguration)
+ public RepositoryContentConsumersStub( ArchivaAdministration archivaAdministration )
{
- super(archivaConfiguration);
+ super( archivaAdministration );
}
@Override
@@ -36,7 +36,7 @@ public class RepositoryContentConsumersS
{
Date startTimeForTest = new Date( System.currentTimeMillis() );
startTimeForTest.setTime( 12345678 );
-
+
return startTimeForTest;
}
}
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryContentConsumersTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryContentConsumersTest.java?rev=1170135&r1=1170134&r2=1170135&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryContentConsumersTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryContentConsumersTest.java Tue Sep 13 12:12:39 2011
@@ -20,10 +20,10 @@ package org.apache.archiva.repository.sc
*/
import junit.framework.TestCase;
+import org.apache.archiva.admin.model.managed.ManagedRepository;
+import org.apache.archiva.admin.model.remote.RemoteRepository;
import org.apache.commons.lang.SystemUtils;
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
-import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
-import org.apache.maven.archiva.configuration.RemoteRepositoryConfiguration;
import org.apache.maven.archiva.consumers.InvalidRepositoryContentConsumer;
import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer;
import org.easymock.MockControl;
@@ -67,18 +67,18 @@ public class RepositoryContentConsumersT
@Inject
ApplicationContext applicationContext;
- protected ManagedRepositoryConfiguration createRepository( String id, String name, File location )
+ protected ManagedRepository createRepository( String id, String name, File location )
{
- ManagedRepositoryConfiguration repo = new ManagedRepositoryConfiguration();
+ ManagedRepository repo = new ManagedRepository();
repo.setId( id );
repo.setName( name );
repo.setLocation( location.getAbsolutePath() );
return repo;
}
- protected RemoteRepositoryConfiguration createRemoteRepository( String id, String name, String url )
+ protected RemoteRepository createRemoteRepository( String id, String name, String url )
{
- RemoteRepositoryConfiguration repo = new RemoteRepositoryConfiguration();
+ RemoteRepository repo = new RemoteRepository();
repo.setId( id );
repo.setName( name );
repo.setUrl( url );
@@ -89,10 +89,13 @@ public class RepositoryContentConsumersT
throws Exception
{
+
ArchivaConfiguration configuration =
applicationContext.getBean( "archivaConfiguration#test-conf", ArchivaConfiguration.class );
- RepositoryContentConsumers consumerUtilStub = new RepositoryContentConsumersStub( configuration );
+ ArchivaAdministrationStub administrationStub = new ArchivaAdministrationStub( configuration );
+
+ RepositoryContentConsumers consumerUtilStub = new RepositoryContentConsumersStub( administrationStub );
RepositoryContentConsumers consumerUtil =
(RepositoryContentConsumers) applicationContext.getBean( "repositoryContentConsumers#test",
@@ -103,7 +106,7 @@ public class RepositoryContentConsumersT
consumerUtilStub.setApplicationContext( context );
consumerUtilStub.setSelectedInvalidConsumers( consumerUtil.getSelectedInvalidConsumers() );
consumerUtilStub.setSelectedKnownConsumers( consumerUtil.getSelectedKnownConsumers() );
- consumerUtilStub.setArchivaConfiguration( configuration );
+ consumerUtilStub.setArchivaAdministration( administrationStub );
assertNotNull( "RepositoryContentConsumers should not be null.", consumerUtilStub );
@@ -264,7 +267,7 @@ public class RepositoryContentConsumersT
consumers.setSelectedInvalidConsumers( Collections.singletonList( selectedInvalidConsumer ) );
- ManagedRepositoryConfiguration repo = createRepository( "id", "name", new File( "target/test-repo" ) );
+ ManagedRepository repo = createRepository( "id", "name", new File( "target/test-repo" ) );
File testFile = new File( "target/test-repo/path/to/test-file.txt" );
Date startTime = new Date( System.currentTimeMillis() );
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryScannerTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryScannerTest.java?rev=1170135&r1=1170134&r2=1170135&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryScannerTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryScannerTest.java Tue Sep 13 12:12:39 2011
@@ -20,6 +20,8 @@ package org.apache.archiva.repository.sc
*/
import junit.framework.TestCase;
+import org.apache.archiva.admin.model.managed.ManagedRepository;
+import org.apache.archiva.admin.model.remote.RemoteRepository;
import org.apache.commons.io.FileUtils;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.maven.archiva.configuration.RemoteRepositoryConfiguration;
@@ -56,18 +58,18 @@ public class RepositoryScannerTest
@Inject
ApplicationContext applicationContext;
- protected ManagedRepositoryConfiguration createRepository( String id, String name, File location )
+ protected ManagedRepository createRepository( String id, String name, File location )
{
- ManagedRepositoryConfiguration repo = new ManagedRepositoryConfiguration();
+ ManagedRepository repo = new ManagedRepository();
repo.setId( id );
repo.setName( name );
repo.setLocation( location.getAbsolutePath() );
return repo;
}
- protected RemoteRepositoryConfiguration createRemoteRepository( String id, String name, String url )
+ protected RemoteRepository createRemoteRepository( String id, String name, String url )
{
- RemoteRepositoryConfiguration repo = new RemoteRepositoryConfiguration();
+ RemoteRepository repo = new RemoteRepository();
repo.setId( id );
repo.setName( name );
repo.setUrl( url );
@@ -77,7 +79,7 @@ public class RepositoryScannerTest
private static final String[] ARTIFACT_PATTERNS =
new String[]{ "**/*.jar", "**/*.pom", "**/*.rar", "**/*.zip", "**/*.war", "**/*.tar.gz" };
- private ManagedRepositoryConfiguration createDefaultRepository()
+ private ManagedRepository createDefaultRepository()
{
File repoDir = new File( "src/test/repositories/default-repository" );
@@ -86,7 +88,7 @@ public class RepositoryScannerTest
return createRepository( "testDefaultRepo", "Test Default Repository", repoDir );
}
- private ManagedRepositoryConfiguration createSimpleRepository()
+ private ManagedRepository createSimpleRepository()
throws IOException, ParseException
{
File srcDir = new File( "src/test/repositories/simple-repository" );
@@ -114,13 +116,13 @@ public class RepositoryScannerTest
return fmt.parse( timestamp ).getTime();
}
- private ManagedRepositoryConfiguration createLegacyRepository()
+ private ManagedRepository createLegacyRepository()
{
File repoDir = new File( "src/test/repositories/legacy-repository" );
assertTrue( "Legacy Test Repository should exist.", repoDir.exists() && repoDir.isDirectory() );
- ManagedRepositoryConfiguration repo = createRepository( "testLegacyRepo", "Test Legacy Repository", repoDir );
+ ManagedRepository repo = createRepository( "testLegacyRepo", "Test Legacy Repository", repoDir );
repo.setLayout( "legacy" );
return repo;
@@ -152,7 +154,7 @@ public class RepositoryScannerTest
public void testTimestampRepositoryScanner()
throws Exception
{
- ManagedRepositoryConfiguration repository = createSimpleRepository();
+ ManagedRepository repository = createSimpleRepository();
List<KnownRepositoryContentConsumer> knownConsumers = new ArrayList<KnownRepositoryContentConsumer>();
KnownScanConsumer consumer = new KnownScanConsumer();
@@ -179,7 +181,7 @@ public class RepositoryScannerTest
public void testTimestampRepositoryScannerFreshScan()
throws Exception
{
- ManagedRepositoryConfiguration repository = createSimpleRepository();
+ ManagedRepository repository = createSimpleRepository();
List<KnownRepositoryContentConsumer> knownConsumers = new ArrayList<KnownRepositoryContentConsumer>();
KnownScanConsumer consumer = new KnownScanConsumer();
@@ -205,7 +207,7 @@ public class RepositoryScannerTest
public void testTimestampRepositoryScannerProcessUnmodified()
throws Exception
{
- ManagedRepositoryConfiguration repository = createSimpleRepository();
+ ManagedRepository repository = createSimpleRepository();
List<KnownRepositoryContentConsumer> knownConsumers = new ArrayList<KnownRepositoryContentConsumer>();
KnownScanConsumer consumer = new KnownScanConsumer();
@@ -232,7 +234,7 @@ public class RepositoryScannerTest
public void testDefaultRepositoryScanner()
throws Exception
{
- ManagedRepositoryConfiguration repository = createDefaultRepository();
+ ManagedRepository repository = createDefaultRepository();
List<KnownRepositoryContentConsumer> knownConsumers = new ArrayList<KnownRepositoryContentConsumer>();
KnownScanConsumer consumer = new KnownScanConsumer();
@@ -293,7 +295,7 @@ public class RepositoryScannerTest
actualArtifactPaths.add( "org/apache/testgroup/discovery/1.0/discovery-1.0.pom" );
actualArtifactPaths.add( "javax/sql/jdbc/2.0/jdbc-2.0.jar" );
- ManagedRepositoryConfiguration repository = createDefaultRepository();
+ ManagedRepository repository = createDefaultRepository();
List<KnownRepositoryContentConsumer> knownConsumers = new ArrayList<KnownRepositoryContentConsumer>();
KnownScanConsumer consumer = new KnownScanConsumer();
@@ -330,7 +332,7 @@ public class RepositoryScannerTest
actualMetadataPaths.add( "javax/sql/maven-metadata-repository.xml" );
actualMetadataPaths.add( "javax/maven-metadata.xml" );
- ManagedRepositoryConfiguration repository = createDefaultRepository();
+ ManagedRepository repository = createDefaultRepository();
List<KnownRepositoryContentConsumer> knownConsumers = new ArrayList<KnownRepositoryContentConsumer>();
KnownScanConsumer knownConsumer = new KnownScanConsumer();
@@ -367,7 +369,7 @@ public class RepositoryScannerTest
actualProjectPaths.add( "org/apache/maven/samplejar/1.0/samplejar-1.0.pom" );
actualProjectPaths.add( "org/apache/testgroup/discovery/1.0/discovery-1.0.pom" );
- ManagedRepositoryConfiguration repository = createDefaultRepository();
+ ManagedRepository repository = createDefaultRepository();
List<KnownRepositoryContentConsumer> knownConsumers = new ArrayList<KnownRepositoryContentConsumer>();
KnownScanConsumer consumer = new KnownScanConsumer();
@@ -408,7 +410,7 @@ public class RepositoryScannerTest
actualArtifactPaths.add( "org.apache.maven.update/jars/test-not-updated-1.0.jar" );
actualArtifactPaths.add( "org.apache.maven.update/jars/test-updated-1.0.jar" );
- ManagedRepositoryConfiguration repository = createLegacyRepository();
+ ManagedRepository repository = createLegacyRepository();
List<KnownRepositoryContentConsumer> knownConsumers = new ArrayList<KnownRepositoryContentConsumer>();
KnownScanConsumer consumer = new KnownScanConsumer();
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/SampleKnownConsumer.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/SampleKnownConsumer.java?rev=1170135&r1=1170134&r2=1170135&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/SampleKnownConsumer.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/SampleKnownConsumer.java Tue Sep 13 12:12:39 2011
@@ -19,14 +19,14 @@ package org.apache.archiva.repository.sc
* under the License.
*/
-import java.util.Date;
-import java.util.List;
-
-import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
+import org.apache.archiva.admin.model.managed.ManagedRepository;
import org.apache.maven.archiva.consumers.AbstractMonitoredConsumer;
import org.apache.maven.archiva.consumers.ConsumerException;
import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer;
+import java.util.Date;
+import java.util.List;
+
/**
* SampleKnownConsumer
*
@@ -41,13 +41,13 @@ public class SampleKnownConsumer
*/
private String id = "unset-id";
- public void beginScan( ManagedRepositoryConfiguration repository, Date whenGathered )
+ public void beginScan( ManagedRepository repository, Date whenGathered )
throws ConsumerException
{
/* nothing to do */
}
- public void beginScan( ManagedRepositoryConfiguration repository, Date whenGathered, boolean executeOnEntireRepo )
+ public void beginScan( ManagedRepository repository, Date whenGathered, boolean executeOnEntireRepo )
throws ConsumerException
{
beginScan( repository, whenGathered );
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/resources/spring-context.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/resources/spring-context.xml?rev=1170135&r1=1170134&r2=1170135&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/resources/spring-context.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/resources/spring-context.xml Tue Sep 13 12:12:39 2011
@@ -31,6 +31,10 @@
<property name="registry" ref="registry#configured"/>
</bean>
+ <bean name="admin-test-conf" class="org.apache.archiva.repository.scanner.ArchivaAdministrationStub">
+ <constructor-arg ref="archivaConfiguration#test-conf"/>
+ </bean>
+
<bean name="registry#configured" class="org.codehaus.redback.components.registry.commons.CommonsConfigurationRegistry">
<property name="properties">
<value>
@@ -84,7 +88,7 @@
</bean>
<bean name="repositoryContentConsumers#test" class="org.apache.archiva.repository.scanner.RepositoryContentConsumersStub">
- <constructor-arg ref="archivaConfiguration#test-conf"/>
+ <constructor-arg ref="admin-test-conf"/>
</bean>
Modified: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-api/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-api/pom.xml?rev=1170135&r1=1170134&r2=1170135&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-api/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-api/pom.xml Tue Sep 13 12:12:39 2011
@@ -29,6 +29,10 @@
<name>Archiva Scheduler :: API</name>
<dependencies>
<dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-repository-admin-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.codehaus.redback.components</groupId>
<artifactId>spring-taskqueue</artifactId>
</dependency>
Modified: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml?rev=1170135&r1=1170134&r2=1170135&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml Tue Sep 13 12:12:39 2011
@@ -34,6 +34,10 @@
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-repository-admin-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
<artifactId>archiva-configuration</artifactId>
</dependency>
<dependency>
Modified: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java?rev=1170135&r1=1170134&r2=1170135&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java (original)
+++ archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java Tue Sep 13 12:12:39 2011
@@ -20,6 +20,7 @@ package org.apache.archiva.scheduler.ind
* under the License.
*/
+import org.apache.archiva.admin.model.managed.ManagedRepository;
import org.apache.archiva.common.plexusbridge.MavenIndexerUtils;
import org.apache.archiva.common.plexusbridge.PlexusSisuBridge;
import org.apache.archiva.common.plexusbridge.PlexusSisuBridgeException;
@@ -104,7 +105,7 @@ public class ArchivaIndexingTaskExecutor
{
ArtifactIndexingTask indexingTask = (ArtifactIndexingTask) task;
- ManagedRepositoryConfiguration repository = indexingTask.getRepository();
+ ManagedRepository repository = indexingTask.getRepository();
IndexingContext context = indexingTask.getContext();
if ( ArtifactIndexingTask.Action.FINISH.equals( indexingTask.getAction() )
@@ -231,7 +232,7 @@ public class ArchivaIndexingTaskExecutor
}
}
- private void finishIndexingTask( ArtifactIndexingTask indexingTask, ManagedRepositoryConfiguration repository,
+ private void finishIndexingTask( ArtifactIndexingTask indexingTask, ManagedRepository repository,
IndexingContext context )
throws TaskExecutionException
{
Modified: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java?rev=1170135&r1=1170134&r2=1170135&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java (original)
+++ archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java Tue Sep 13 12:12:39 2011
@@ -19,7 +19,7 @@ package org.apache.archiva.scheduler.ind
* under the License.
*/
-import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
+import org.apache.archiva.admin.model.managed.ManagedRepository;
import org.apache.maven.index.NexusIndexer;
import org.apache.maven.index.context.IndexCreator;
import org.apache.maven.index.context.IndexingContext;
@@ -41,7 +41,7 @@ public class ArtifactIndexingTask
FINISH
}
- private final ManagedRepositoryConfiguration repository;
+ private final ManagedRepository repository;
private final File resourceFile;
@@ -56,7 +56,7 @@ public class ArtifactIndexingTask
*/
private boolean onlyUpdate = false;
- public ArtifactIndexingTask( ManagedRepositoryConfiguration repository, File resourceFile, Action action,
+ public ArtifactIndexingTask( ManagedRepository repository, File resourceFile, Action action,
IndexingContext context )
{
this.repository = repository;
@@ -65,14 +65,14 @@ public class ArtifactIndexingTask
this.context = context;
}
- public ArtifactIndexingTask( ManagedRepositoryConfiguration repository, File resourceFile, Action action,
+ public ArtifactIndexingTask( ManagedRepository repository, File resourceFile, Action action,
IndexingContext context, boolean executeOnEntireRepo )
{
this( repository, resourceFile, action, context );
this.executeOnEntireRepo = executeOnEntireRepo;
}
- public ArtifactIndexingTask( ManagedRepositoryConfiguration repository, File resourceFile, Action action,
+ public ArtifactIndexingTask( ManagedRepository repository, File resourceFile, Action action,
IndexingContext context, boolean executeOnEntireRepo, boolean onlyUpdate )
{
this( repository, resourceFile, action, context, executeOnEntireRepo );
@@ -104,7 +104,7 @@ public class ArtifactIndexingTask
return action;
}
- public ManagedRepositoryConfiguration getRepository()
+ public ManagedRepository getRepository()
{
return repository;
}
@@ -190,17 +190,17 @@ public class ArtifactIndexingTask
* @throws IOException
* @throws UnsupportedExistingLuceneIndexException
*/
- public static IndexingContext createContext( ManagedRepositoryConfiguration repository, NexusIndexer indexer,
+ public static IndexingContext createContext( ManagedRepository repository, NexusIndexer indexer,
List<? extends IndexCreator> indexCreators )
throws IOException, UnsupportedExistingLuceneIndexException
{
- String indexDir = repository.getIndexDir();
+ String indexDir = repository.getIndexDirectory();
File managedRepository = new File( repository.getLocation() );
File indexDirectory = null;
if ( indexDir != null && !"".equals( indexDir ) )
{
- indexDirectory = new File( repository.getIndexDir() );
+ indexDirectory = new File( repository.getIndexDirectory() );
}
else
{
Modified: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java?rev=1170135&r1=1170134&r2=1170135&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java Tue Sep 13 12:12:39 2011
@@ -20,6 +20,7 @@ package org.apache.archiva.scheduler.ind
*/
import junit.framework.TestCase;
+import org.apache.archiva.admin.model.managed.ManagedRepository;
import org.apache.archiva.common.plexusbridge.MavenIndexerUtils;
import org.apache.archiva.common.plexusbridge.PlexusSisuBridge;
import org.apache.commons.io.FileUtils;
@@ -67,9 +68,7 @@ public class ArchivaIndexingTaskExecutor
@Inject
private ArchivaIndexingTaskExecutor indexingExecutor;
- private ManagedRepositoryConfiguration repositoryConfig;
-
- private Configuration configuration;
+ private ManagedRepository repositoryConfig;
private NexusIndexer indexer;
@@ -85,7 +84,7 @@ public class ArchivaIndexingTaskExecutor
{
super.setUp();
- repositoryConfig = new ManagedRepositoryConfiguration();
+ repositoryConfig = new ManagedRepository();
repositoryConfig.setId( "test-repo" );
repositoryConfig.setLocation( "target/test-classes/test-repo" );
repositoryConfig.setLayout( "default" );
@@ -94,9 +93,6 @@ public class ArchivaIndexingTaskExecutor
repositoryConfig.setSnapshots( false );
repositoryConfig.setReleases( true );
- configuration = new Configuration();
- configuration.addManagedRepository( repositoryConfig );
-
indexer = plexusSisuBridge.lookup( NexusIndexer.class );
ArtifactIndexingTask.createContext( repositoryConfig, indexer, mavenIndexerUtils.getAllIndexCreators() );
Modified: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java?rev=1170135&r1=1170134&r2=1170135&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java (original)
+++ archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java Tue Sep 13 12:12:39 2011
@@ -19,6 +19,9 @@ package org.apache.archiva.scheduler.rep
* under the License.
*/
+import org.apache.archiva.admin.model.RepositoryAdminException;
+import org.apache.archiva.admin.model.managed.ManagedRepository;
+import org.apache.archiva.admin.model.managed.ManagedRepositoryAdmin;
import org.apache.archiva.metadata.repository.MetadataRepository;
import org.apache.archiva.metadata.repository.MetadataRepositoryException;
import org.apache.archiva.metadata.repository.RepositorySession;
@@ -30,8 +33,6 @@ import org.apache.archiva.repository.sca
import org.apache.archiva.repository.scanner.RepositoryScanner;
import org.apache.archiva.repository.scanner.RepositoryScannerException;
import org.apache.commons.lang.StringUtils;
-import org.apache.maven.archiva.configuration.ArchivaConfiguration;
-import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
import org.codehaus.plexus.taskqueue.Task;
@@ -39,12 +40,10 @@ import org.codehaus.plexus.taskqueue.exe
import org.codehaus.plexus.taskqueue.execution.TaskExecutor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.scheduling.TaskScheduler;
import org.springframework.stereotype.Service;
import javax.annotation.PostConstruct;
import javax.inject.Inject;
-import javax.inject.Named;
import java.util.Date;
/**
@@ -52,7 +51,7 @@ import java.util.Date;
*
* @version $Id$
*/
-@Service("taskExecutor#repository-scanning")
+@Service( "taskExecutor#repository-scanning" )
public class ArchivaRepositoryScanningTaskExecutor
implements TaskExecutor, Initializable
{
@@ -62,13 +61,10 @@ public class ArchivaRepositoryScanningTa
*
*/
@Inject
- @Named(value="archivaConfiguration#default")
- private ArchivaConfiguration archivaConfiguration;
+ private ManagedRepositoryAdmin managedRepositoryAdmin;
/**
* The repository scanner component.
- *
- *
*/
@Inject
private RepositoryScanner repoScanner;
@@ -89,7 +85,6 @@ public class ArchivaRepositoryScanningTa
/**
* TODO: may be different implementations
- *
*/
@Inject
private RepositorySessionFactory repositorySessionFactory;
@@ -105,102 +100,109 @@ public class ArchivaRepositoryScanningTa
public void executeTask( Task task )
throws TaskExecutionException
{
-
- // TODO: replace this whole class with the prescribed content scanning service/action
- // - scan repository for artifacts that do not have corresponding metadata or have been updated and
- // send events for each
- // - scan metadata for artifacts that have been removed and send events for each
- // - scan metadata for missing plugin data
- // - store information so that it can restart upon failure (publish event on the server recovery
- // queue, remove it on successful completion)
-
- this.task = task;
-
- RepositoryTask repoTask = (RepositoryTask) task;
-
- String repoId = repoTask.getRepositoryId();
- if ( StringUtils.isBlank( repoId ) )
+ try
{
- throw new TaskExecutionException( "Unable to execute RepositoryTask with blank repository Id." );
- }
+ // TODO: replace this whole class with the prescribed content scanning service/action
+ // - scan repository for artifacts that do not have corresponding metadata or have been updated and
+ // send events for each
+ // - scan metadata for artifacts that have been removed and send events for each
+ // - scan metadata for missing plugin data
+ // - store information so that it can restart upon failure (publish event on the server recovery
+ // queue, remove it on successful completion)
- ManagedRepositoryConfiguration arepo = archivaConfiguration.getConfiguration().findManagedRepositoryById(
- repoId );
+ this.task = task;
- // execute consumers on resource file if set
- if ( repoTask.getResourceFile() != null )
- {
- log.debug( "Executing task from queue with job name: {}", repoTask );
- consumers.executeConsumers( arepo, repoTask.getResourceFile(), repoTask.isUpdateRelatedArtifacts() );
- }
- else
- {
- log.info( "Executing task from queue with job name: {}", repoTask );
+ RepositoryTask repoTask = (RepositoryTask) task;
- // otherwise, execute consumers on whole repository
- if ( arepo == null )
+ String repoId = repoTask.getRepositoryId();
+ if ( StringUtils.isBlank( repoId ) )
{
- throw new TaskExecutionException(
- "Unable to execute RepositoryTask with invalid repository id: " + repoId );
+ throw new TaskExecutionException( "Unable to execute RepositoryTask with blank repository Id." );
}
- long sinceWhen = RepositoryScanner.FRESH_SCAN;
- long previousFileCount = 0;
+ ManagedRepository arepo = managedRepositoryAdmin.getManagedRepository( repoId );
- RepositorySession repositorySession = repositorySessionFactory.createSession();
- MetadataRepository metadataRepository = repositorySession.getRepository();
- try
+ // execute consumers on resource file if set
+ if ( repoTask.getResourceFile() != null )
+ {
+ log.debug( "Executing task from queue with job name: {}", repoTask );
+ consumers.executeConsumers( arepo, repoTask.getResourceFile(), repoTask.isUpdateRelatedArtifacts() );
+ }
+ else
{
- if ( !repoTask.isScanAll() )
+ log.info( "Executing task from queue with job name: {}", repoTask );
+
+ // otherwise, execute consumers on whole repository
+ if ( arepo == null )
{
- RepositoryStatistics previousStats = repositoryStatisticsManager.getLastStatistics(
- metadataRepository, repoId );
- if ( previousStats != null )
- {
- sinceWhen = previousStats.getScanStartTime().getTime();
- previousFileCount = previousStats.getTotalFileCount();
- }
+ throw new TaskExecutionException(
+ "Unable to execute RepositoryTask with invalid repository id: " + repoId );
}
- RepositoryScanStatistics stats;
+ long sinceWhen = RepositoryScanner.FRESH_SCAN;
+ long previousFileCount = 0;
+
+ RepositorySession repositorySession = repositorySessionFactory.createSession();
+ MetadataRepository metadataRepository = repositorySession.getRepository();
try
{
- stats = repoScanner.scan( arepo, sinceWhen );
- }
- catch ( RepositoryScannerException e )
- {
- throw new TaskExecutionException( "Repository error when executing repository job.", e );
- }
+ if ( !repoTask.isScanAll() )
+ {
+ RepositoryStatistics previousStats =
+ repositoryStatisticsManager.getLastStatistics( metadataRepository, repoId );
+ if ( previousStats != null )
+ {
+ sinceWhen = previousStats.getScanStartTime().getTime();
+ previousFileCount = previousStats.getTotalFileCount();
+ }
+ }
+
+ RepositoryScanStatistics stats;
+ try
+ {
+ stats = repoScanner.scan( arepo, sinceWhen );
+ }
+ catch ( RepositoryScannerException e )
+ {
+ throw new TaskExecutionException( "Repository error when executing repository job.", e );
+ }
- log.info( "Finished first scan: " + stats.toDump( arepo ) );
+ log.info( "Finished first scan: {}", stats.toDump( arepo ) );
- // further statistics will be populated by the following method
- Date endTime = new Date( stats.getWhenGathered().getTime() + stats.getDuration() );
+ // further statistics will be populated by the following method
+ Date endTime = new Date( stats.getWhenGathered().getTime() + stats.getDuration() );
- log.info( "Gathering repository statistics" );
+ log.info( "Gathering repository statistics" );
- repositoryStatisticsManager.addStatisticsAfterScan( metadataRepository, repoId, stats.getWhenGathered(),
- endTime, stats.getTotalFileCount(),
- stats.getTotalFileCount() - previousFileCount );
- repositorySession.save();
- }
- catch ( MetadataRepositoryException e )
- {
- throw new TaskExecutionException( "Unable to store updated statistics: " + e.getMessage(), e );
- }
- finally
- {
- repositorySession.close();
- }
+ repositoryStatisticsManager.addStatisticsAfterScan( metadataRepository, repoId,
+ stats.getWhenGathered(), endTime,
+ stats.getTotalFileCount(),
+ stats.getTotalFileCount() - previousFileCount );
+ repositorySession.save();
+ }
+ catch ( MetadataRepositoryException e )
+ {
+ throw new TaskExecutionException( "Unable to store updated statistics: " + e.getMessage(), e );
+ }
+ finally
+ {
+ repositorySession.close();
+ }
// log.info( "Scanning for removed repository content" );
// metadataRepository.findAllProjects();
- // FIXME: do something
+ // FIXME: do something
- log.info( "Finished repository task: {}", repoTask );
+ log.info( "Finished repository task: {}", repoTask );
- this.task = null;
+ this.task = null;
+ }
+ }
+ catch ( RepositoryAdminException e )
+ {
+ log.error( e.getMessage(), e );
+ throw new TaskExecutionException( e.getMessage(), e );
}
}
@@ -209,16 +211,6 @@ public class ArchivaRepositoryScanningTa
return task;
}
- public ArchivaConfiguration getArchivaConfiguration()
- {
- return archivaConfiguration;
- }
-
- public void setArchivaConfiguration( ArchivaConfiguration archivaConfiguration )
- {
- this.archivaConfiguration = archivaConfiguration;
- }
-
public RepositoryScanner getRepoScanner()
{
return repoScanner;
@@ -258,4 +250,14 @@ public class ArchivaRepositoryScanningTa
{
this.repositoryStatisticsManager = repositoryStatisticsManager;
}
+
+ public ManagedRepositoryAdmin getManagedRepositoryAdmin()
+ {
+ return managedRepositoryAdmin;
+ }
+
+ public void setManagedRepositoryAdmin( ManagedRepositoryAdmin managedRepositoryAdmin )
+ {
+ this.managedRepositoryAdmin = managedRepositoryAdmin;
+ }
}
Added: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/MockArchivaAdministration.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/MockArchivaAdministration.java?rev=1170135&view=auto
==============================================================================
--- archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/MockArchivaAdministration.java (added)
+++ archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/MockArchivaAdministration.java Tue Sep 13 12:12:39 2011
@@ -0,0 +1,166 @@
+package org.apache.archiva.mock;
+/*
+ * 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.
+ */
+
+import org.apache.archiva.admin.model.AuditInformation;
+import org.apache.archiva.admin.model.RepositoryAdminException;
+import org.apache.archiva.admin.model.admin.ArchivaAdministration;
+import org.apache.archiva.admin.model.admin.FileType;
+import org.apache.archiva.admin.model.admin.LegacyArtifactPath;
+import org.apache.archiva.admin.model.admin.OrganisationInformation;
+import org.apache.maven.archiva.configuration.ArchivaConfiguration;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Olivier Lamy
+ */
+public class MockArchivaAdministration
+ implements ArchivaAdministration
+{
+ private ArchivaConfiguration archivaConfiguration;
+
+ public List<LegacyArtifactPath> getLegacyArtifactPaths()
+ throws RepositoryAdminException
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void addLegacyArtifactPath( LegacyArtifactPath legacyArtifactPath, AuditInformation auditInformation )
+ throws RepositoryAdminException
+ {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void deleteLegacyArtifactPath( String path, AuditInformation auditInformation )
+ throws RepositoryAdminException
+ {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void addFileTypePattern( String fileTypeId, String pattern, AuditInformation auditInformation )
+ throws RepositoryAdminException
+ {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void removeFileTypePattern( String fileTypeId, String pattern, AuditInformation auditInformation )
+ throws RepositoryAdminException
+ {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public List<FileType> getFileTypes()
+ throws RepositoryAdminException
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public FileType getFileType( String fileTypeId )
+ throws RepositoryAdminException
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void addFileType( FileType fileType, AuditInformation auditInformation )
+ throws RepositoryAdminException
+ {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void removeFileType( String fileTypeId, AuditInformation auditInformation )
+ throws RepositoryAdminException
+ {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void addKnownContentConsumer( String knownContentConsumer, AuditInformation auditInformation )
+ throws RepositoryAdminException
+ {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void setKnownContentConsumers( List<String> knownContentConsumers, AuditInformation auditInformation )
+ throws RepositoryAdminException
+ {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public List<String> getKnownContentConsumers()
+ throws RepositoryAdminException
+ {
+ return new ArrayList<String>(
+ getArchivaConfiguration().getConfiguration().getRepositoryScanning().getKnownContentConsumers() );
+ }
+
+ public void removeKnownContentConsumer( String knownContentConsumer, AuditInformation auditInformation )
+ throws RepositoryAdminException
+ {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void addInvalidContentConsumer( String invalidContentConsumer, AuditInformation auditInformation )
+ throws RepositoryAdminException
+ {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void setInvalidContentConsumers( List<String> invalidContentConsumers, AuditInformation auditInformation )
+ throws RepositoryAdminException
+ {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public List<String> getInvalidContentConsumers()
+ throws RepositoryAdminException
+ {
+ return new ArrayList<String>(
+ getArchivaConfiguration().getConfiguration().getRepositoryScanning().getInvalidContentConsumers() );
+ }
+
+ public void removeInvalidContentConsumer( String invalidContentConsumer, AuditInformation auditInformation )
+ throws RepositoryAdminException
+ {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public OrganisationInformation getOrganisationInformation()
+ throws RepositoryAdminException
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void setOrganisationInformation( OrganisationInformation organisationInformation )
+ throws RepositoryAdminException
+ {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public ArchivaConfiguration getArchivaConfiguration()
+ {
+ return archivaConfiguration;
+ }
+
+ public void setArchivaConfiguration( ArchivaConfiguration archivaConfiguration )
+ {
+ this.archivaConfiguration = archivaConfiguration;
+ }
+}
Added: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/MockManagedRepositoryAdmin.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/MockManagedRepositoryAdmin.java?rev=1170135&view=auto
==============================================================================
--- archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/MockManagedRepositoryAdmin.java (added)
+++ archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/MockManagedRepositoryAdmin.java Tue Sep 13 12:12:39 2011
@@ -0,0 +1,116 @@
+package org.apache.archiva.mock;
+/*
+ * 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.
+ */
+
+import org.apache.archiva.admin.model.AuditInformation;
+import org.apache.archiva.admin.model.RepositoryAdminException;
+import org.apache.archiva.admin.model.managed.ManagedRepository;
+import org.apache.archiva.admin.model.managed.ManagedRepositoryAdmin;
+import org.apache.commons.lang.StringUtils;
+import org.apache.maven.archiva.configuration.ArchivaConfiguration;
+import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author Olivier Lamy
+ */
+public class MockManagedRepositoryAdmin
+ implements ManagedRepositoryAdmin
+{
+ private ArchivaConfiguration archivaConfiguration;
+
+ public List<ManagedRepository> getManagedRepositories()
+ throws RepositoryAdminException
+ {
+ List<ManagedRepositoryConfiguration> managedRepoConfigs =
+ getArchivaConfiguration().getConfiguration().getManagedRepositories();
+
+ List<ManagedRepository> managedRepos = new ArrayList<ManagedRepository>( managedRepoConfigs.size() );
+
+ for ( ManagedRepositoryConfiguration repoConfig : managedRepoConfigs )
+ {
+ // TODO add staging repo information back too
+ ManagedRepository repo =
+ new ManagedRepository( repoConfig.getId(), repoConfig.getName(), repoConfig.getLocation(),
+ repoConfig.getLayout(), repoConfig.isSnapshots(), repoConfig.isReleases(),
+ repoConfig.isBlockRedeployments(), repoConfig.getRefreshCronExpression(),
+ repoConfig.getIndexDir(), repoConfig.isScanned(), repoConfig.getDaysOlder(),
+ repoConfig.getRetentionCount(), repoConfig.isDeleteReleasedSnapshots() );
+
+ managedRepos.add( repo );
+ }
+
+ return managedRepos;
+ }
+
+ public Map<String, ManagedRepository> getManagedRepositoriesAsMap()
+ throws RepositoryAdminException
+ {
+ return null;
+ }
+
+ public ManagedRepository getManagedRepository( String repositoryId )
+ throws RepositoryAdminException
+ {
+ List<ManagedRepository> repos = getManagedRepositories();
+ for ( ManagedRepository repo : repos )
+ {
+ if ( StringUtils.equals( repo.getId(), repositoryId ) )
+ {
+ return repo;
+ }
+ }
+ return null;
+ }
+
+ public Boolean deleteManagedRepository( String repositoryId, AuditInformation auditInformation,
+ boolean deleteContent )
+ throws RepositoryAdminException
+ {
+ return null;
+ }
+
+ public Boolean addManagedRepository( ManagedRepository managedRepository, boolean needStageRepo,
+ AuditInformation auditInformation )
+ throws RepositoryAdminException
+ {
+ return null;
+ }
+
+ public Boolean updateManagedRepository( ManagedRepository managedRepository, boolean needStageRepo,
+ AuditInformation auditInformation, boolean resetStats )
+ throws RepositoryAdminException
+ {
+ return null;
+ }
+
+ public ArchivaConfiguration getArchivaConfiguration()
+ {
+ return archivaConfiguration;
+ }
+
+ public void setArchivaConfiguration( ArchivaConfiguration archivaConfiguration )
+ {
+ this.archivaConfiguration = archivaConfiguration;
+ }
+}
Added: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/MockRemoteRepositoryAdmin.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/MockRemoteRepositoryAdmin.java?rev=1170135&view=auto
==============================================================================
--- archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/MockRemoteRepositoryAdmin.java (added)
+++ archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/MockRemoteRepositoryAdmin.java Tue Sep 13 12:12:39 2011
@@ -0,0 +1,84 @@
+package org.apache.archiva.mock;
+/*
+ * 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.
+ */
+
+import org.apache.archiva.admin.model.AuditInformation;
+import org.apache.archiva.admin.model.RepositoryAdminException;
+import org.apache.archiva.admin.model.remote.RemoteRepository;
+import org.apache.archiva.admin.model.remote.RemoteRepositoryAdmin;
+import org.apache.maven.archiva.configuration.ArchivaConfiguration;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author Olivier Lamy
+ */
+public class MockRemoteRepositoryAdmin
+ implements RemoteRepositoryAdmin
+{
+ private ArchivaConfiguration archivaConfiguration;
+
+ public List<RemoteRepository> getRemoteRepositories()
+ throws RepositoryAdminException
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public RemoteRepository getRemoteRepository( String repositoryId )
+ throws RepositoryAdminException
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public Boolean deleteRemoteRepository( String repositoryId, AuditInformation auditInformation )
+ throws RepositoryAdminException
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public Boolean addRemoteRepository( RemoteRepository remoteRepository, AuditInformation auditInformation )
+ throws RepositoryAdminException
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public Boolean updateRemoteRepository( RemoteRepository remoteRepository, AuditInformation auditInformation )
+ throws RepositoryAdminException
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public Map<String, RemoteRepository> getRemoteRepositoriesAsMap()
+ throws RepositoryAdminException
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public ArchivaConfiguration getArchivaConfiguration()
+ {
+ return archivaConfiguration;
+ }
+
+ public void setArchivaConfiguration( ArchivaConfiguration archivaConfiguration )
+ {
+ this.archivaConfiguration = archivaConfiguration;
+ }
+}
Modified: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestConsumer.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestConsumer.java?rev=1170135&r1=1170134&r2=1170135&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestConsumer.java (original)
+++ archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestConsumer.java Tue Sep 13 12:12:39 2011
@@ -19,7 +19,7 @@ package org.apache.archiva.scheduler.rep
* under the License.
*/
-import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
+import org.apache.archiva.admin.model.managed.ManagedRepository;
import org.apache.maven.archiva.consumers.AbstractMonitoredConsumer;
import org.apache.maven.archiva.consumers.ConsumerException;
import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer;
@@ -31,7 +31,6 @@ import org.apache.maven.archiva.reposito
import org.springframework.stereotype.Service;
import javax.inject.Inject;
-import javax.inject.Named;
import java.util.Collection;
import java.util.Collections;
import java.util.Date;
@@ -76,7 +75,7 @@ public class TestConsumer
return null;
}
- public void beginScan( ManagedRepositoryConfiguration repository, Date whenGathered )
+ public void beginScan( ManagedRepository repository, Date whenGathered )
throws ConsumerException
{
consumed.clear();
@@ -91,7 +90,7 @@ public class TestConsumer
}
}
- public void beginScan( ManagedRepositoryConfiguration repository, Date whenGathered, boolean executeOnEntireRepo )
+ public void beginScan( ManagedRepository repository, Date whenGathered, boolean executeOnEntireRepo )
throws ConsumerException
{
beginScan( repository, whenGathered );
Modified: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/spring-context.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/spring-context.xml?rev=1170135&r1=1170134&r2=1170135&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/spring-context.xml (original)
+++ archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/spring-context.xml Tue Sep 13 12:12:39 2011
@@ -30,10 +30,22 @@
<context:annotation-config/>
<context:component-scan base-package="org.apache.archiva.metadata.repository"/>
- <bean name="taskExecutor#test-repository-scanning" class="org.apache.archiva.scheduler.repository.ArchivaRepositoryScanningTaskExecutor">
+ <bean name="managedRepoAdmin#test" class="org.apache.archiva.mock.MockManagedRepositoryAdmin">
+ <property name="archivaConfiguration" ref="archivaConfiguration#test-repository-scanning"/>
+ </bean>
+
+ <bean name="archivaAdministration#mock" class="org.apache.archiva.mock.MockArchivaAdministration">
+ <property name="archivaConfiguration" ref="archivaConfiguration#test-repository-scanning"/>
+ </bean>
+
+ <bean name="remoteRepositoryAdmin#mock" class="org.apache.archiva.mock.MockRemoteRepositoryAdmin">
<property name="archivaConfiguration" ref="archivaConfiguration#test-repository-scanning"/>
</bean>
+ <bean name="taskExecutor#test-repository-scanning" class="org.apache.archiva.scheduler.repository.ArchivaRepositoryScanningTaskExecutor">
+ <property name="managedRepositoryAdmin" ref="managedRepoAdmin#test"/>
+ </bean>
+
<bean name="repositoryContentFactory#default" class="org.apache.maven.archiva.repository.RepositoryContentFactory">
<property name="archivaConfiguration" ref="archivaConfiguration#test-repository-scanning"/>
</bean>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/Artifact.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/Artifact.java?rev=1170135&r1=1170134&r2=1170135&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/Artifact.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/Artifact.java Tue Sep 13 12:12:39 2011
@@ -36,7 +36,36 @@ public class Artifact
private String type;
- //private Date whenGathered;
+ private String url;
+
+ /**
+ * contains osgi metadata Bundle-Version if available
+ *
+ * @since 1.4
+ */
+ private String bundleVersion;
+
+ /**
+ * contains osgi metadata Bundle-SymbolicName if available
+ *
+ * @since 1.4
+ */
+ private String bundleSymbolicName;
+
+ /**
+ * contains osgi metadata Export-Package if available
+ *
+ * @since 1.4
+ */
+ private String bundleExportPackage;
+
+ /**
+ * contains osgi metadata Export-Service if available
+ *
+ * @since 1.4
+ */
+ private String bundleExportService;
+
public Artifact()
{
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/ManagedRepository.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/ManagedRepository.java?rev=1170135&r1=1170134&r2=1170135&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/ManagedRepository.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/ManagedRepository.java Tue Sep 13 12:12:39 2011
@@ -45,10 +45,13 @@ public class ManagedRepository
private boolean stageRepoNeeded;
- private String cronExpression;
+ // default value
+ private String cronExpression = "0 0 * * * ?";
private boolean resetStats;
+ private boolean scanned =false;
+
public ManagedRepository()
{
// no op
@@ -173,6 +176,16 @@ public class ManagedRepository
this.resetStats = resetStats;
}
+ public boolean isScanned()
+ {
+ return scanned;
+ }
+
+ public void setScanned( boolean scanned )
+ {
+ this.scanned = scanned;
+ }
+
public int hashCode()
{
int result = 17;
@@ -205,14 +218,15 @@ public class ManagedRepository
sb.append( "ManagedRepository" );
sb.append( "{id='" ).append( id ).append( '\'' );
sb.append( ", name='" ).append( name ).append( '\'' );
- sb.append( ", location='" ).append( location ).append( '\'' );
sb.append( ", layout='" ).append( layout ).append( '\'' );
+ sb.append( ", location='" ).append( location ).append( '\'' );
sb.append( ", snapshots=" ).append( snapshots );
sb.append( ", releases=" ).append( releases );
sb.append( ", blockRedeployments=" ).append( blockRedeployments );
sb.append( ", stageRepoNeeded=" ).append( stageRepoNeeded );
sb.append( ", cronExpression='" ).append( cronExpression ).append( '\'' );
sb.append( ", resetStats=" ).append( resetStats );
+ sb.append( ", scanned=" ).append( scanned );
sb.append( '}' );
return sb.toString();
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml?rev=1170135&r1=1170134&r2=1170135&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml Tue Sep 13 12:12:39 2011
@@ -39,7 +39,7 @@
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
- <artifactId>archiva-repository-admin</artifactId>
+ <artifactId>archiva-repository-admin-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
@@ -55,6 +55,10 @@
<artifactId>archiva-scheduler-repository</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-indexer</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.codehaus.redback</groupId>
<artifactId>redback-authorization-api</artifactId>
<exclusions>
@@ -212,6 +216,12 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-repository-admin-default</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>
@@ -234,6 +244,7 @@
<systemPropertyVariables>
<plexus.home>${project.build.outputDirectory}</plexus.home>
<appserver.base>${basedir}/target/appserver-base</appserver.base>
+ <targetDir>${basedir}/target/</targetDir>
</systemPropertyVariables>
</configuration>
</plugin>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java?rev=1170135&r1=1170134&r2=1170135&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java Tue Sep 13 12:12:39 2011
@@ -18,7 +18,7 @@ package org.apache.archiva.rest.services
* under the License.
*/
-import org.apache.archiva.admin.AuditInformation;
+import org.apache.archiva.admin.model.AuditInformation;
import org.apache.archiva.audit.AuditListener;
import org.codehaus.plexus.redback.users.User;
import org.codehaus.redback.rest.services.RedbackAuthenticationThreadLocal;
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaAdministrationService.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaAdministrationService.java?rev=1170135&r1=1170134&r2=1170135&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaAdministrationService.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaAdministrationService.java Tue Sep 13 12:12:39 2011
@@ -19,8 +19,8 @@ package org.apache.archiva.rest.services
*/
import net.sf.beanlib.provider.replicator.BeanReplicator;
-import org.apache.archiva.admin.repository.RepositoryAdminException;
-import org.apache.archiva.admin.repository.admin.ArchivaAdministration;
+import org.apache.archiva.admin.model.RepositoryAdminException;
+import org.apache.archiva.admin.model.admin.ArchivaAdministration;
import org.apache.archiva.rest.api.model.FileType;
import org.apache.archiva.rest.api.model.LegacyArtifactPath;
import org.apache.archiva.rest.api.model.OrganisationInformation;
@@ -51,7 +51,7 @@ public class DefaultArchivaAdministratio
try
{
List<LegacyArtifactPath> legacyArtifactPaths = new ArrayList<LegacyArtifactPath>();
- for ( org.apache.archiva.admin.repository.admin.LegacyArtifactPath legacyArtifactPath : archivaAdministration.getLegacyArtifactPaths() )
+ for ( org.apache.archiva.admin.model.admin.LegacyArtifactPath legacyArtifactPath : archivaAdministration.getLegacyArtifactPaths() )
{
legacyArtifactPaths.add(
new BeanReplicator().replicateBean( legacyArtifactPath, LegacyArtifactPath.class ) );
@@ -70,7 +70,7 @@ public class DefaultArchivaAdministratio
try
{
archivaAdministration.addLegacyArtifactPath( new BeanReplicator().replicateBean( legacyArtifactPath,
- org.apache.archiva.admin.repository.admin.LegacyArtifactPath.class ),
+ org.apache.archiva.admin.model.admin.LegacyArtifactPath.class ),
getAuditInformation() );
}
catch ( RepositoryAdminException e )
@@ -127,8 +127,7 @@ public class DefaultArchivaAdministratio
{
try
{
- org.apache.archiva.admin.repository.admin.FileType fileType =
- archivaAdministration.getFileType( fileTypeId );
+ org.apache.archiva.admin.model.admin.FileType fileType = archivaAdministration.getFileType( fileTypeId );
if ( fileType == null )
{
return null;
@@ -146,9 +145,9 @@ public class DefaultArchivaAdministratio
{
try
{
- archivaAdministration.addFileType( new BeanReplicator().replicateBean( fileType,
- org.apache.archiva.admin.repository.admin.FileType.class ),
- getAuditInformation() );
+ archivaAdministration.addFileType(
+ new BeanReplicator().replicateBean( fileType, org.apache.archiva.admin.model.admin.FileType.class ),
+ getAuditInformation() );
}
catch ( RepositoryAdminException e )
{
@@ -257,14 +256,13 @@ public class DefaultArchivaAdministratio
{
try
{
- List<org.apache.archiva.admin.repository.admin.FileType> modelfileTypes =
- archivaAdministration.getFileTypes();
+ List<org.apache.archiva.admin.model.admin.FileType> modelfileTypes = archivaAdministration.getFileTypes();
if ( modelfileTypes == null || modelfileTypes.isEmpty() )
{
return Collections.emptyList();
}
List<FileType> fileTypes = new ArrayList<FileType>( modelfileTypes.size() );
- for ( org.apache.archiva.admin.repository.admin.FileType fileType : modelfileTypes )
+ for ( org.apache.archiva.admin.model.admin.FileType fileType : modelfileTypes )
{
fileTypes.add( new BeanReplicator().replicateBean( fileType, FileType.class ) );
}
@@ -307,7 +305,7 @@ public class DefaultArchivaAdministratio
{
try
{
- org.apache.archiva.admin.repository.admin.OrganisationInformation organisationInformation =
+ org.apache.archiva.admin.model.admin.OrganisationInformation organisationInformation =
archivaAdministration.getOrganisationInformation();
return organisationInformation == null
@@ -333,7 +331,7 @@ public class DefaultArchivaAdministratio
{
archivaAdministration.setOrganisationInformation(
new BeanReplicator().replicateBean( organisationInformation,
- org.apache.archiva.admin.repository.admin.OrganisationInformation.class ) );
+ org.apache.archiva.admin.model.admin.OrganisationInformation.class ) );
}
}
catch ( RepositoryAdminException e )
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java?rev=1170135&r1=1170134&r2=1170135&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java Tue Sep 13 12:12:39 2011
@@ -18,8 +18,8 @@ package org.apache.archiva.rest.services
* under the License.
*/
-import org.apache.archiva.admin.repository.RepositoryAdminException;
-import org.apache.archiva.admin.repository.managed.ManagedRepositoryAdmin;
+import org.apache.archiva.admin.model.RepositoryAdminException;
+import org.apache.archiva.admin.model.managed.ManagedRepositoryAdmin;
import org.apache.archiva.rest.api.model.ManagedRepository;
import org.apache.archiva.rest.api.services.ArchivaRestServiceException;
import org.apache.archiva.rest.api.services.ManagedRepositoriesService;
@@ -48,12 +48,12 @@ public class DefaultManagedRepositoriesS
{
try
{
- List<org.apache.archiva.admin.repository.managed.ManagedRepository> repos =
+ List<org.apache.archiva.admin.model.managed.ManagedRepository> repos =
managedRepositoryAdmin.getManagedRepositories();
List<ManagedRepository> managedRepos = new ArrayList<ManagedRepository>( repos.size() );
- for ( org.apache.archiva.admin.repository.managed.ManagedRepository repoConfig : repos )
+ for ( org.apache.archiva.admin.model.managed.ManagedRepository repoConfig : repos )
{
// TODO staging repo too
ManagedRepository repo =
@@ -96,8 +96,8 @@ public class DefaultManagedRepositoriesS
public Boolean addManagedRepository( ManagedRepository managedRepository )
throws Exception
{
- org.apache.archiva.admin.repository.managed.ManagedRepository repo =
- new org.apache.archiva.admin.repository.managed.ManagedRepository();
+ org.apache.archiva.admin.model.managed.ManagedRepository repo =
+ new org.apache.archiva.admin.model.managed.ManagedRepository();
repo.setLocation( managedRepository.getLocation() );
repo.setBlockRedeployments( managedRepository.isBlockRedeployments() );
repo.setCronExpression( managedRepository.getCronExpression() );
@@ -114,8 +114,8 @@ public class DefaultManagedRepositoriesS
public Boolean updateManagedRepository( ManagedRepository managedRepository )
throws Exception
{
- org.apache.archiva.admin.repository.managed.ManagedRepository repo =
- new org.apache.archiva.admin.repository.managed.ManagedRepository();
+ org.apache.archiva.admin.model.managed.ManagedRepository repo =
+ new org.apache.archiva.admin.model.managed.ManagedRepository();
repo.setLocation( managedRepository.getLocation() );
repo.setBlockRedeployments( managedRepository.isBlockRedeployments() );
repo.setCronExpression( managedRepository.getCronExpression() );
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultNetworkProxyService.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultNetworkProxyService.java?rev=1170135&r1=1170134&r2=1170135&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultNetworkProxyService.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultNetworkProxyService.java Tue Sep 13 12:12:39 2011
@@ -19,8 +19,8 @@ package org.apache.archiva.rest.services
*/
import net.sf.beanlib.provider.replicator.BeanReplicator;
-import org.apache.archiva.admin.repository.RepositoryAdminException;
-import org.apache.archiva.admin.repository.networkproxy.NetworkProxyAdmin;
+import org.apache.archiva.admin.model.RepositoryAdminException;
+import org.apache.archiva.admin.model.networkproxy.NetworkProxyAdmin;
import org.apache.archiva.rest.api.model.NetworkProxy;
import org.apache.archiva.rest.api.services.ArchivaRestServiceException;
import org.apache.archiva.rest.api.services.NetworkProxyService;
@@ -47,7 +47,7 @@ public class DefaultNetworkProxyService
try
{
List<NetworkProxy> networkProxies = new ArrayList<NetworkProxy>();
- for ( org.apache.archiva.admin.repository.networkproxy.NetworkProxy networkProxy : networkProxyAdmin.getNetworkProxies() )
+ for ( org.apache.archiva.admin.model.networkproxy.NetworkProxy networkProxy : networkProxyAdmin.getNetworkProxies() )
{
networkProxies.add( new BeanReplicator().replicateBean( networkProxy, NetworkProxy.class ) );
}
@@ -64,7 +64,7 @@ public class DefaultNetworkProxyService
{
try
{
- org.apache.archiva.admin.repository.networkproxy.NetworkProxy networkProxy =
+ org.apache.archiva.admin.model.networkproxy.NetworkProxy networkProxy =
networkProxyAdmin.getNetworkProxy( networkProxyId );
return networkProxy == null ? null : new BeanReplicator().replicateBean( networkProxy, NetworkProxy.class );
}
@@ -84,7 +84,7 @@ public class DefaultNetworkProxyService
return;
}
getNetworkProxyAdmin().addNetworkProxy( new BeanReplicator().replicateBean( networkProxy,
- org.apache.archiva.admin.repository.networkproxy.NetworkProxy.class ),
+ org.apache.archiva.admin.model.networkproxy.NetworkProxy.class ),
getAuditInformation() );
}
catch ( RepositoryAdminException e )
@@ -103,7 +103,7 @@ public class DefaultNetworkProxyService
try
{
getNetworkProxyAdmin().updateNetworkProxy( new BeanReplicator().replicateBean( networkProxy,
- org.apache.archiva.admin.repository.networkproxy.NetworkProxy.class ),
+ org.apache.archiva.admin.model.networkproxy.NetworkProxy.class ),
getAuditInformation() );
}
catch ( RepositoryAdminException e )